diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
index 4ae7710c88..5bf002abef 100644
--- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
@@ -440,6 +440,8 @@ static int smbk5pwd_exop_passwd(
 			*c++ = *d++;
 			d++;
 		}
+		pwd.bv_len /= 2;
+		pwd.bv_val[pwd.bv_len] = '\0';
 
 		ml = ch_malloc(sizeof(Modifications));
 		ml->sml_next = qpw->rs_mods;