diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index ddeec15a143f8d725a84f91ca81d20eb5108c1fb..eb5ead1044627c1ca0e5fb91d69de452896b9533 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -308,11 +308,9 @@ do_bind(
 				ber_dupbv( &op->o_conn->c_ndn, &op->o_conn->c_dn );
 			}
 			op->o_tmpfree( op->orb_edn.bv_val, op->o_tmpmemctx );
-			op->orb_edn.bv_val = NULL;
-			op->orb_edn.bv_len = 0;
+			BER_BVZERO( &op->orb_edn );
 			op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
-			op->o_conn->c_sasl_bind_mech.bv_val = NULL;
-			op->o_conn->c_sasl_bind_mech.bv_len = 0;
+			BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
 			op->o_conn->c_sasl_bind_in_progress = 0;
 
 			op->o_conn->c_sasl_ssf = op->orb_ssf;