diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
index a37742e3b..3c1c41629 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
@@ -150,6 +150,9 @@ public class UserDirectory implements Directory<String, User> {
 
         // Get user
         MySQLUser user = userService.retrieveUser(identifier);
+        
+        if(user == null)
+            return null;
 
         // Verify access is granted
         permissionCheckService.verifyUserAccess(this.user_id,
@@ -157,7 +160,7 @@ public class UserDirectory implements Directory<String, User> {
                 MySQLConstants.USER_READ);
 
         // Return user
-        return userService.retrieveUser(identifier);
+        return user;
 
     }