diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index bfb271b675..d2a85f818c 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -59,7 +59,9 @@ int passwd_extop(
 		return LDAP_STRONG_AUTH_REQUIRED;
 	}
 
+	qpw->rs_old.bv_len = 0;
 	qpw->rs_old.bv_val = NULL;
+	qpw->rs_new.bv_len = 0;
 	qpw->rs_new.bv_val = NULL;
 	qpw->rs_mods = NULL;
 	qpw->rs_modtail = NULL;