diff --git a/scripts/upgrade b/scripts/upgrade
index d6ecfed..84d27f5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -185,13 +185,15 @@ if mysqlshow | grep -q "^| $db_name "; then
 
   ynh_script_progression --message="Creating a PostgreSQL database..." --weight=10
 
-  postgres_db_pwd=$(ynh_string_random --length=24)
-  ynh_app_setting_set --app=$app --key=psqlpwd --value=$postgres_db_pwd
-
+  db_name=$(ynh_sanitize_dbid --db_name=$app)
+  db_user=$db_name
+  ynh_app_setting_set --app=$app --key=db_name --value=$db_name
   ynh_psql_test_if_first_run
-  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$postgres_db_pwd
+  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
+  ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd
+
   # Migrating from MySQL to PostgreSQL
-  pgloader mysql://$db_user:$mysql_db_pwd@localhost:3306/$db_name postgresql://$db_user:$postgres_db_pwd@localhost:5432/$db_name
+  pgloader mysql://$db_user:$mysql_db_pwd@localhost:3306/$db_name postgresql://$db_user:$db_pwd@localhost:5432/$db_name
   # Removinging MySQL database
   ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 else