diff --git a/openldap/docker-compose.yml b/openldap/docker-compose.yml
index 2f89948..132f49c 100644
--- a/openldap/docker-compose.yml
+++ b/openldap/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     environment:
       - "LDAP_ORGANISATION=${ldap_domain:-$app_fqdn}"
       - "LDAP_DOMAIN=${ldap_domain:-$app_fqdn}"
-      - "LDAP_ADMIN_PASSWORD=$ldap_admin_bind_passwd"
+      - "LDAP_ADMIN_PASSWORD=${ldap_admin_bind_passwd:-$app_admin_passwd}"
       - "LDAP_RFC2307BIS_SCHEMA=true"
       - "LDAP_REMOVE_CONFIG_AFTER_SETUP=true"
       - "LDAP_TLS_VERIFY_CLIENT=never"