diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index 0b5b6488f..91a6b1b49 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -137,10 +137,13 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider<U
         
         // Validate and return info for given user and pass
         AuthInfo info = mapping.get(credentials.getUsername());
-        if (info != null && info.validate(credentials.getUsername(), credentials.getPassword()))
+        if (info != null && info.validate(credentials.getUsername(), credentials.getPassword())) {
             configs.put("DEFAULT", info.getConfiguration());
+            return configs;
+        }
 
-        return configs;
+        // Unauthorized
+        return null;
 
     }