diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/AuthenticationRedirectionFilter.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/AuthenticationRedirectionFilter.cs
index faa845a4b..486b2f86f 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Services/AuthenticationRedirectionFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Services/AuthenticationRedirectionFilter.cs
@@ -16,6 +16,8 @@ namespace Orchard.Users.Services {
 
         public void OnAuthenticationChallenge(AuthenticationChallengeContext filterContext) {
             if (filterContext.Result is HttpUnauthorizedResult) {
+                filterContext.HttpContext.Response.SuppressFormsAuthenticationRedirect = true;
+
                 filterContext.Result = new RedirectToRouteResult(
                     new RouteValueDictionary
                 {
diff --git a/src/Orchard/UI/Admin/AdminFilter.cs b/src/Orchard/UI/Admin/AdminFilter.cs
index a5b37d9da..cd78c4e37 100644
--- a/src/Orchard/UI/Admin/AdminFilter.cs
+++ b/src/Orchard/UI/Admin/AdminFilter.cs
@@ -22,7 +22,6 @@ namespace Orchard.UI.Admin {
             if (IsAdmin(filterContext)) {
                 if (!_authorizer.Authorize(StandardPermissions.AccessAdminPanel, T("Can't access the admin"))) {
                     filterContext.Result = new HttpUnauthorizedResult();
-                    filterContext.HttpContext.Response.SuppressFormsAuthenticationRedirect = true;
                 }
 
                 Apply(filterContext.RequestContext);