diff --git a/octoprint_auth_ldap/__init__.py b/octoprint_auth_ldap/__init__.py
index c4569e6..122194d 100644
--- a/octoprint_auth_ldap/__init__.py
+++ b/octoprint_auth_ldap/__init__.py
@@ -99,7 +99,10 @@ class LDAPUserManager(FilebasedUserManager,
 
                 group_filter = "(cn=octoprint,ou=Groups,ou=People,dc=edinburghhacklab,dc=com)"
 
-                query = "(&(objectClass=groupOfNames)%s(uid=%s))" % (group_filter, userid)
+                #query = "(&(objectClass=groupOfNames)%s(uid=%s))" % (group_filter, userid)
+
+                query = '(&(objectClass=groupOfNames)(cn=octoprint)(member="uid=%s,ou=Accounts,ou=People,dc=edinburghhacklab,dc=com"))' % userid
+
                 self._logger.error("LDAP-AUTH QUERY:" + query)
                 group_result = connection.search_s(ldap_search_base, ldap.SCOPE_SUBTREE, query)