diff --git a/create-multiple-databases.sh b/create-multiple-databases.sh
index e67f0e1..64c9c06 100644
--- a/create-multiple-databases.sh
+++ b/create-multiple-databases.sh
@@ -13,13 +13,15 @@ function create_user_and_database() {
         psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
             CREATE USER "$user";
             ALTER USER "$user" WITH ENCRYPTED PASSWORD '$password';
+            CREATE DATABASE "$database";
+            GRANT ALL PRIVILEGES ON DATABASE "$database" TO "$user";
 EOSQL
-    fi
-
-    psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
-      CREATE DATABASE "$database";
-      GRANT ALL PRIVILEGES ON DATABASE "$database" TO "$user";
+    else
+        psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
+            CREATE DATABASE "$database";
+            GRANT ALL PRIVILEGES ON DATABASE "$database" TO "$user";
 EOSQL
+    fi
 }
 
 if [ -n "$POSTGRES_MULTIPLE_DATABASES" ]; then