diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
index 4d63b5fea..cae0f9030 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/AuthenticationProviderService.java
@@ -95,8 +95,6 @@ public class AuthenticationProviderService {
 
         // Pull username attributes from properties
         List<String> usernameAttributes = confService.getUsernameAttributes();
-        if (usernameAttributes.isEmpty())
-            return null;
 
         // We need exactly one base DN to derive the user DN
         if (usernameAttributes.size() != 1)
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
index f5f75cd1c..e545e56ab 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/StringListProperty.java
@@ -56,7 +56,11 @@ public abstract class StringListProperty implements GuacamoleProperty<List<Strin
             return null;
 
         // Split string into a list of individual values
-        return Arrays.asList(DELIMITER_PATTERN.split(values));
+        List<String> stringValues = Arrays.asList(DELIMITER_PATTERN.split(values));
+        if (stringValues.isEmpty())
+            return null;
+
+        return stringValues;
 
     }