diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index f163dc65ff..a398ac9b75 100644
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -1045,11 +1045,11 @@ unique_add(
 	Debug(LDAP_DEBUG_TRACE, "==> unique_add <%s>\n",
 	      op->o_req_dn.bv_val );
 
-	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ||
-	     get_relax(op) > SLAP_CONTROL_IGNORED
-	     && access_allowed ( op, op->ora_e,
-				 slap_schema.si_ad_entry, NULL,
-				 ACL_MANAGE, NULL ) ) {
+	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) || (
+			get_relax(op) > SLAP_CONTROL_IGNORED
+			&& access_allowed( op, op->ora_e,
+				slap_schema.si_ad_entry, NULL,
+				ACL_MANAGE, NULL ) ) ) {
 		return rc;
 	}
 
@@ -1180,13 +1180,13 @@ unique_modify(
 		return rc;
 	}
 
-	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ||
-	     get_relax(op) > SLAP_CONTROL_IGNORED
-	     && overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
-	     && e
-	     && access_allowed ( op, e,
-				 slap_schema.si_ad_entry, NULL,
-				 ACL_MANAGE, NULL ) ) {
+	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) || (
+			get_relax(op) > SLAP_CONTROL_IGNORED
+			&& overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
+			&& e
+			&& access_allowed( op, e,
+				slap_schema.si_ad_entry, NULL,
+				ACL_MANAGE, NULL ) ) ) {
 		overlay_entry_release_ov( op, e, 0, on );
 		return rc;
 	}
@@ -1301,13 +1301,13 @@ unique_modrdn(
 	Debug(LDAP_DEBUG_TRACE, "==> unique_modrdn <%s> <%s>\n",
 		op->o_req_dn.bv_val, op->orr_newrdn.bv_val );
 
-	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ||
-	     get_relax(op) > SLAP_CONTROL_IGNORED
-	     && overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
-	     && e
-	     && access_allowed ( op, e,
-				 slap_schema.si_ad_entry, NULL,
-				 ACL_MANAGE, NULL ) ) {
+	if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) || (
+			get_relax(op) > SLAP_CONTROL_IGNORED
+			&& overlay_entry_get_ov(op, &op->o_req_ndn, NULL, NULL, 0, &e, on) == LDAP_SUCCESS
+			&& e
+			&& access_allowed( op, e,
+				slap_schema.si_ad_entry, NULL,
+				ACL_MANAGE, NULL ) ) ) {
 		overlay_entry_release_ov( op, e, 0, on );
 		return rc;
 	}