diff --git a/servers/slapd/overlays/otp.c b/servers/slapd/overlays/otp.c
index 80cd3790d3..aa57111aa4 100644
--- a/servers/slapd/overlays/otp.c
+++ b/servers/slapd/overlays/otp.c
@@ -959,6 +959,7 @@ otp_check_and_update( Operation *op, BerValue *totpdn, BerValue *hotpdn,
 
 		op2.o_tag = LDAP_REQ_MODIFY;
 		op2.orm_modlist = mod;
+		op2.orm_no_opattrs = 0;
 		op2.o_dn = op->o_bd->be_rootdn;
 		op2.o_ndn = op->o_bd->be_rootndn;
 		op2.o_req_dn = ndn;
@@ -969,6 +970,9 @@ otp_check_and_update( Operation *op, BerValue *totpdn, BerValue *hotpdn,
 		if ( rs2.sr_err != LDAP_SUCCESS ) {
 			rc = LDAP_OTHER;
 		}
+		if ( m->sml_next ) {
+			slap_mods_free( m->sml_next, 1 );
+		}
 	}
 
 	return rc;