diff --git a/servers/slapd/overlays/otp.c b/servers/slapd/overlays/otp.c
index aa57111aa4..e2ffab03e8 100644
--- a/servers/slapd/overlays/otp.c
+++ b/servers/slapd/overlays/otp.c
@@ -966,6 +966,9 @@ otp_check_and_update( Operation *op, BerValue *totpdn, BerValue *hotpdn,
 		op2.o_req_ndn = ndn;
 		op2.o_opid = -1;
 
+		slap_op_time( &op2.o_time, &op2.o_tincr );
+		BER_BVZERO( &op2.o_csn );
+
 		rc = op2.o_bd->be_modify( &op2, &rs2 );
 		if ( rs2.sr_err != LDAP_SUCCESS ) {
 			rc = LDAP_OTHER;