diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 3667b07a4e..2624b98d2f 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -360,6 +360,7 @@ int main( int argc, char **argv )
 #endif
 
 	extops_init();
+	lutil_passwd_init();
 
 #ifdef SLAPD_MODULES
 	if ( module_init() != 0 ) {
@@ -614,6 +615,8 @@ stop:
 
 	schema_destroy();
 
+	lutil_passwd_destroy();
+
 #ifdef HAVE_TLS
 	ldap_pvt_tls_destroy();
 #endif