diff --git a/scripts/restore b/scripts/restore
index e66d1fd..d4fa5a3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -5,8 +5,9 @@ set -eu
 source /usr/share/yunohost/helpers
 
 # Retrieve old app settings
-domain=$(ynh_app_setting_get $app domain)
 app="jappix"
+domain=$(ynh_app_setting_get $app domain)
+
 
 # Restore sources & data
 sudo cp -a ./sources "/var/www/${app}"
diff --git a/scripts/upgrade b/scripts/upgrade
index 4c259d8..23eeee7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,10 +13,10 @@ name=$(ynh_app_setting_get "$app" name)
 language=$(ynh_app_setting_get "$app" language)
 
 # Retrieve arguments
-domain=$(ynh_app_setting_set "$app" $domain)
-path=$(ynh_app_setting_set "$app" $path)
-name=$(ynh_app_setting_set "$app" $name)
-language=$(ynh_app_setting_set "$app" $language)
+domain=$(ynh_app_setting_set "$app" domain)
+path=$(ynh_app_setting_set "$app" path)
+name=$(ynh_app_setting_set "$app" name)
+language=$(ynh_app_setting_set "$app" language)
 
 # Set default values
 name="${name:-YunoJappix}"