diff --git a/scripts/upgrade b/scripts/upgrade
index 7b00dd4..9dea720 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,7 +98,7 @@ if ynh_version_gt "1.0.0~ynh1" "${previous_version}" ; then
 	ynh_user_password=$(ynh_string_random --length=30)
 	ynh_app_setting_set --app=$app --key=ynh_user_password --value=$ynh_user_password
 
-	yunohost user create ${app}_notifs -firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0
+	yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0
 	yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email
 
 	# Manage previous .env file
@@ -231,6 +231,15 @@ chmod 750 "$datadir"
 chmod -R o-rwx "$datadir"
 chown -R $app:$app "$datadir"
 
+#=================================================
+# MAKE SETUP
+#=================================================
+ynh_script_progression --message="Making setup..."
+
+pushd $final_path/live
+	ynh_exec_as $app ./bin/mobilizon_ctl migrate
+popd
+
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
@@ -243,15 +252,6 @@ ynh_replace_string --match_string="adapter: Swoosh.Adapters.SMTP," --replace_str
 ynh_replace_string --match_string="relay: \"127.0.0.1\"," --replace_string="server: \"127.0.0.1\"," --target_file="$config"
 ynh_store_file_checksum --file="$config"
 
-#=================================================
-# MAKE SETUP
-#=================================================
-ynh_script_progression --message="Making setup..."
-
-pushd $final_path/live
-	ynh_exec_as $app ./bin/mobilizon_ctl migrate
-popd
-
 chmod 400 "$config"
 chown $app:$app "$config"