diff --git a/scripts/_common.sh b/scripts/_common.sh
index d970f80..591ab81 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -19,10 +19,9 @@ mysql-to-pg() {
 
 		mysql_db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
-		db_pwd=$(ynh_string_random --length=24)
-		ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 		ynh_psql_test_if_first_run
-		ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+		ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
+		db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 
 		# Migrating from MySQL to PostgreSQL
 		pgloader mysql://mattermost:$mysql_db_pwd@localhost:3306/mattermost postgresql://mattermost:$db_pwd@localhost:5432/mattermost
diff --git a/scripts/upgrade b/scripts/upgrade
index c24320b..7c783d1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -173,7 +173,6 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # MIGRATING DATABASE
 #=================================================
-ynh_script_progression --message="Migrating from MySQL to PostgreSQL..." --weight=10
 
 # Migrating from MySQL to PostgreSQL
 mysql-to-pg