diff --git a/.gitignore b/.gitignore
index 8727f14..3e037cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 ~.sw[op]
 .DS_Store
+*.sw[op]
diff --git a/manifest.toml b/manifest.toml
index a6331fd..dba5b40 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -65,6 +65,7 @@ ram.runtime = "0M"
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index cb1662c..f9f6f26 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,5 +8,16 @@ configure_element()
 {
     ynh_config_add --template="config.json" --destination="$install_dir/config.json"
     chmod -R u=rwX,g=rX,o= "$install_dir"
-    chown -R $app:www-data "$install_dir"
+    chown -R "$app":www-data "$install_dir"
+}
+
+set_settings_default() {
+    ynh_app_setting_set_default --key=disable_custom_urls --value=false
+    ynh_app_setting_set_default --key=disable_guests --value=false
+    ynh_app_setting_set_default --key=disable_3pid_login --value=false
+    ynh_app_setting_set_default --key=default_country_code --value=GB
+    ynh_app_setting_set_default --key=brand_text --value=Element
+    ynh_app_setting_set_default --key=default_federate --value=true
+    ynh_app_setting_set_default --key=default_theme --value=light
+    ynh_app_setting_set_default --key=show_labs_settings --value=false
 }
diff --git a/scripts/install b/scripts/install
index a6cb3eb..972989d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -7,23 +7,7 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-disable_custom_urls=false
-disable_guests=false
-disable_3pid_login=false
-default_country_code=GB
-brand_text=Element
-default_federate=true
-default_theme=light
-show_labs_settings=false
-
-ynh_app_setting_set --key=disable_custom_urls --value=$disable_custom_urls
-ynh_app_setting_set --key=disable_guests --value=$disable_guests
-ynh_app_setting_set --key=disable_3pid_login --value=$disable_3pid_login
-ynh_app_setting_set --key=default_country_code --value=$default_country_code
-ynh_app_setting_set --key=brand_text --value=$brand_text
-ynh_app_setting_set --key=default_federate --value=$default_federate
-ynh_app_setting_set --key=default_theme --value=$default_theme
-ynh_app_setting_set --key=show_labs_settings --value=$show_labs_settings
+set_settings_default
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/restore b/scripts/restore
index 6826928..cb9cbf7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,7 +10,6 @@ source /usr/share/yunohost/helpers
 ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
-
 chown -R "$app":www-data "$install_dir"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 2de10ee..d28d964 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,50 +8,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression 'Ensuring downward compatibility...'
 
-if [ -z "${default_home_server:-}" ]; then
-    default_home_server='matrix.org'
-    ynh_app_setting_set --key=default_home_server --value=$default_home_server
-fi
-
-if [ -z "${disable_custom_urls:-}" ]; then
-    disable_custom_urls=false
-    ynh_app_setting_set --key=disable_custom_urls --value=$disable_custom_urls
-fi
-
-if [ -z "${disable_guests:-}" ]; then
-    disable_guests=false
-    ynh_app_setting_set --key=disable_guests --value=$disable_guests
-fi
-
-if [ -z "${disable_3pid_login:-}" ]; then
-    disable_3pid_login=false
-    ynh_app_setting_set --key=disable_3pid_login --value=$disable_3pid_login
-fi
-
-if [ -z "${default_country_code:-}" ]; then
-    default_country_code=false
-    ynh_app_setting_set --key=default_country_code --value=$default_country_code
-fi
-
-if [ -z "${brand_text:-}" ]; then
-    brand_text=Element
-    ynh_app_setting_set --key=brand_text --value=$brand_text
-fi
-
-if [ -z "${default_federate:-}" ]; then
-    default_federate=true
-    ynh_app_setting_set --key=default_federate --value=$default_federate
-fi
-
-if [ -z "${default_theme:-}" ]; then
-    default_theme=light
-    ynh_app_setting_set --key=default_theme --value=$default_theme
-fi
-
-if [ -z "${show_labs_settings:-}" ]; then
-    show_labs_settings=false
-    ynh_app_setting_set --key=show_labs_settings --value=$show_labs_settings
-fi
+ynh_app_setting_set_default --key=default_home_server --value='matrix.org'
+set_settings_default
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/tests.toml b/tests.toml
index 0545023..1705338 100644
--- a/tests.toml
+++ b/tests.toml
@@ -13,3 +13,5 @@ test_format = 1.0
     # -------------------------------
 
     test_upgrade_from.26a68cb850f5886aa78671e241a897f48910f314.name = "Upgrade from 1.11.37"
+
+    test_upgrade_from.edb0ce692951b49b9c768b715e74ac98e3299171.name = "Before helper 2.1"