diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
index 4d051cb336e751bd076f15607b7dc058f421dea0..45b64cadd5e4668e531ef9a90e47186b73bab263 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
@@ -84,8 +84,8 @@ public class LoginServlet extends HttpServlet {
                 StatementElement statementElement = new StatementElement("username", "=", object.getUsername(), "");
                 statementList.addStatement(statementElement);
                 User user =  dataStore.getUserDao().getObjects(statementList).get(0);
-                if(certificateAuthority.getLatestCRL().get() != null) {
-                    if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
+                if(!user.getAccessLevelName().equals("ADMIN") && certificateAuthority.getLatestCRL().get() != null) {
+                    if(certificateAuthority.getLatestCRL().get().getRevokedCertificate(user.getCertificate().getSerialNumber()) != null)
                         TomcatCustomErrorHandler.sendCustomError(resp, 401, "Invalid credentials provided!");
                 }
             }