diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index fe386246d9..1a9bf057eb 100644
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -85,6 +85,9 @@ passwd_back_search(
 			e->e_attrs = NULL;
 			e->e_dn = ch_strdup( base );
 
+			e->e_ndn = ch_strdup( e->e_dn );
+			(void) dn_normalize( e->e_ndn );
+
 			/* Use the first attribute of the DN
 		 	* as an attribute within the entry itself.
 		 	*/