diff --git a/src/server.c b/src/server.c
index a4cd5620..541d4107 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2587,7 +2587,7 @@ int processCommand(client *c) {
     }
 
     /* Check if the user is authenticated */
-    if (server.requirepass &&
+    if (!(DefaultUser->flags & USER_FLAG_NOPASS) &&
         !c->authenticated &&
         (c->cmd->proc != authCommand || c->cmd->proc == helloCommand))
     {