diff -urN extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
--- extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java	2016-01-13 19:00:13.000000000 +0100
+++ extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java	2016-08-05 08:57:27.545943070 +0200
@@ -191,4 +191,22 @@
         );
     }
 
+    /**
+     * Returns Max results a ldap query can return
+     * guacamole.properties. By default, this will be 1000.
+     *
+     * @return
+     *     Returns Max results a ldap query can return, as configured with
+     *     guacamole.properties.
+     *
+     * @throws GuacamoleException
+     *     If guacamole.properties cannot be parsed.
+     */
+    public int getMaxResults() throws GuacamoleException {
+        return environment.getProperty(
+            LDAPGuacamoleProperties.LDAP_MAX_SEARCH_RESULTS,
+            1000 
+        );
+    }
+
 }
diff -urN extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
--- extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java	2016-01-13 19:00:13.000000000 +0100
+++ extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java	2016-08-05 08:58:12.193641827 +0200
@@ -136,4 +136,17 @@
 
     };
 
+    /**
+     * The maxResult a ldap search can return
+     *
+    */
+    public static final IntegerGuacamoleProperty LDAP_MAX_SEARCH_RESULTS = new IntegerGuacamoleProperty() {
+
+        @Override
+        public String getName() { return "ldap-maxresults"; }
+
+    };
+
+
+
 }
diff -urN extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java
--- extensions/guacamole-auth-ldap.old/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java	2016-01-13 19:00:13.000000000 +0100
+++ extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/user/UserService.java	2016-08-05 09:02:28.090184570 +0200
@@ -28,6 +28,7 @@
 import com.novell.ldap.LDAPEntry;
 import com.novell.ldap.LDAPException;
 import com.novell.ldap.LDAPSearchResults;
+import com.novell.ldap.LDAPSearchConstraints;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -89,6 +90,9 @@
             String usernameAttribute) throws GuacamoleException {
 
         try {
+	    //change search limits
+	    LDAPSearchConstraints constraints = new LDAPSearchConstraints();
+	    constraints.setMaxResults(confService.getMaxResults());
 
             // Find all Guacamole users underneath base DN
             LDAPSearchResults results = ldapConnection.search(
@@ -96,7 +100,8 @@
                 LDAPConnection.SCOPE_SUB,
                 "(&(objectClass=*)(" + escapingService.escapeLDAPSearchFilter(usernameAttribute) + "=*))",
                 null,
-                false
+                false,
+		constraints
             );
 
             // Read all visible users