diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
index affb8c52a77107c2bc02eb85189be23281fc0dcd..625901a852d76ff0edd5087ba63f58b5711b3adc 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
@@ -186,12 +186,12 @@ public abstract class LdapDAO
                 }
                 if (p instanceof NumericPrincipal)
                 {
-                    ldapField = "(&(objectclass=cadcaccount)(numericid=" + p.getName() + "))";
+                    ldapField = "(numericid=" + p.getName() + ")";
                     break;
                 }
                 if (p instanceof X500Principal)
                 {
-                    ldapField = "(&(objectclass=cadcaccount)(distinguishedname=" + p.getName() + "))";
+                    ldapField = "(distinguishedname=" + p.getName() + ")";
                     break;
                 }
                 if (p instanceof OpenIdPrincipal)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index 219728d8a32b0ae1eb1e05296c04bb87ae825d2c..44a91260bef6165b1c286d981d0c616595c8ef2b 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -466,8 +466,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
                     "Unsupported principal type " + userID.getClass());
         }
 
-        searchField = "(&(objectclass=inetorgperson)(objectclass=cadcaccount)(" +
-                      searchField + "=" + userID.getName() + "))";
+        searchField = "(" + searchField + "=" + userID.getName() + ")";
         logger.debug(searchField);
 
         SearchResultEntry searchResult = null;