diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 92858bd..74d608c 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -22,7 +22,7 @@ file_env() {
 }
 
 load_vars() {
-  if [ -n "${CMD_DB_PASSWORD:-""}" ] ; then
+  if [ -n "${CMD_DB_PASSWORD_FILE:-""}" ] ; then
     file_env "CMD_DB_PASSWORD"
   fi
   file_env "CMD_OAUTH2_CLIENT_SECRET"
@@ -42,7 +42,7 @@ main() {
 
 main
 
-if [ -z "${CMD_DB_URL:-""}" ] ; then
+if [ -n "${CMD_DB_PASSWORD_FILE:-""}" ] ; then
   export CMD_DB_URL="${CMD_DB_TYPE}://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME"
 fi