diff --git a/Containers/postgresql/init-user-db.sh b/Containers/postgresql/init-user-db.sh
index b3c8f47f..53bf2682 100644
--- a/Containers/postgresql/init-user-db.sh
+++ b/Containers/postgresql/init-user-db.sh
@@ -2,7 +2,7 @@
 set -ex
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-	CREATE USER "oc_$POSTGRES_USER" WITH PASSWORD "$POSTGRES_PASSWORD";
+	CREATE USER "oc_$POSTGRES_USER" WITH PASSWORD '$POSTGRES_PASSWORD';
 	GRANT ALL PRIVILEGES ON DATABASE "$POSTGRES_DB" TO "oc_$POSTGRES_USER";
 EOSQL
 
diff --git a/Containers/postgresql/start.sh b/Containers/postgresql/start.sh
index e4ac9827..4690a65d 100644
--- a/Containers/postgresql/start.sh
+++ b/Containers/postgresql/start.sh
@@ -63,7 +63,7 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
 
     # Restore database
     echo "Restoring the database from database dump"
-    psql "$POSTGRES_DB" -U "$POSTGRES_USER" < "$DUMP_FILE"
+    psql "$POSTGRES_DB" -U "oc_$POSTGRES_USER" < "$DUMP_FILE"
 
     # Shut down the database to be able to start it again
     pg_ctl stop -m fast