diff --git a/comanage-registry-slapd-base/comanage_ldap_utils.sh b/comanage-registry-slapd-base/comanage_ldap_utils.sh
index fef0b68..81582a7 100755
--- a/comanage-registry-slapd-base/comanage_ldap_utils.sh
+++ b/comanage-registry-slapd-base/comanage_ldap_utils.sh
@@ -105,7 +105,7 @@ function comanage_ldap_utils::bootstrap() {
     local suffix="${OLC_SUFFIX:-dc=my,dc=org}"
     local root_dn="${OLC_ROOT_DN:-cn=admin,dc=my,dc=org}"
 
-    if [[ -n "${OLC_ROOT_DN_PASSWORD}" && -z "${OLC_ROOT_PW}" ]]; then
+    if [[ -n "${OLC_ROOT_DN_PASSWORD}" && "${OLC_ROOT_PW}" = "password" ]]; then
         local root_pw="${OLC_ROOT_DN_PASSWORD}"
     else
         local root_pw="${OLC_ROOT_PW:-password}"