diff --git a/scripts/install b/scripts/install
index 832deac..b0d42d7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -101,8 +101,6 @@ ynh_setup_source "$final_path"
 # NGINX CONFIGURATION
 #=================================================
 
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
diff --git a/scripts/upgrade b/scripts/upgrade
index dc36d3d..8c86f0a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -55,8 +55,17 @@ fi
 
 if [ -z "$db_pwd" ]; then
 	db_pwd=$(ynh_app_setting_get $app db_pwd)	# Fix old db_pwd
-	ynh_app_setting_delete $app db_pwd
-	ynh_app_setting_set $app psqlpwd $db_pwd
+	if [ -z "$db_pwd" ]; then
+		db_name=$(ynh_sanitize_dbid "$app")
+		db_user=$db_name
+		# Initialize database and store postgres password for upgrade
+		ynh_psql_setup_db "$db_name" "$db_user"
+		ynh_app_setting_set "$app" db_name "$db_name"
+		db_pwd=$(ynh_app_setting_get $app psqlpwd) # Password created in ynh_psql_setup_db function
+	else
+		ynh_app_setting_delete $app db_pwd
+		ynh_app_setting_set $app psqlpwd $db_pwd
+	fi
 fi
 
 #=================================================