diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index a511032fda27fabb7c90e681cc492ade10912637..ee3f60184afcab8975b2b53d13ca79f261e5a8e9 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -601,8 +601,9 @@ sub add_ldap_admin {
 
   # Get the configuration to know which attribute must be used in the dn
   my $mesg = $ldap->search(
-    base => "$base",
-    filter => "(&(objectClass=fusionDirectoryConf)(cn=fusiondirectory))",
+    base => "$configrdn,$base",
+    filter => '(objectClass=fusionDirectoryConf)',
+    scope => 'base',
     attrs => ['fdAccountPrimaryAttribute', 'fdForcePasswordDefaultHash', 'fdPasswordDefaultHash']
   );
   $mesg->code && die $mesg->error;