diff --git a/docker/usersetup.sh b/docker/usersetup.sh
index c5348b1..fa3fdb8 100644
--- a/docker/usersetup.sh
+++ b/docker/usersetup.sh
@@ -10,16 +10,16 @@ until psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -d "${POSTGRES_DB}" -c '\
 done
 echo "PostgreSQL is ready."
 
-USER_EXISTS=$(psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -tAc \
+USER_EXISTS=$(psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -d "${POSTGRES_DB}" -tAc \
     "SELECT 1 FROM pg_roles WHERE rolname = '${POSTGRES_RUNTIME_USER}'")
 
 if [ "${USER_EXISTS}" != "1" ]; then
     echo "Creating user '${POSTGRES_RUNTIME_USER}'..."
-    psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" \
+    psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -d "${POSTGRES_DB}" \
         -c "CREATE USER \"${POSTGRES_RUNTIME_USER}\" WITH PASSWORD '${POSTGRES_RUNTIME_PASSWORD}'"
 else
     echo "User '${POSTGRES_RUNTIME_USER}' already exists, ensuring password is current..."
-    psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" \
+    psql -h "${POSTGRES_HOST}" -U "${POSTGRES_USER}" -d "${POSTGRES_DB}" \
         -c "ALTER USER \"${POSTGRES_RUNTIME_USER}\" WITH PASSWORD '${POSTGRES_RUNTIME_PASSWORD}'"
 fi