diff --git a/scm-webapp/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java b/scm-webapp/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
index 95ffae7d65..e7ef7c43af 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java
@@ -240,12 +240,11 @@ public class ChainAuthenticatonManager extends AbstractAuthenticationManager
             authenticator.getClass().getName(), result);
         }
 
-        // CR: Removed check on state=failed to allow next module to
-        // continue
         if ((result != null) && (result.getState() != null)
-          && result.getState().isSuccessfully())
+          && (result.getState().isSuccessfully()
+            || (result.getState() == AuthenticationState.FAILED)))
         {
-          if (result.getUser() != null)
+          if (result.getState().isSuccessfully() && (result.getUser() != null))
           {
             User user = result.getUser();