Merge pull request #6801 from nupplaphil/issue/notification_wrong_redirect