diff --git a/conf/config.json b/conf/config.json
index 4fe2638..f1e631e 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -8,11 +8,11 @@
             "base_url": "https://vector.im"
         }
     },
-    "disable_custom_urls": false,
-    "disable_guests": false,
+    "disable_custom_urls": __DISABLE_CUSTOM_URLS__,
+    "disable_guests": __DISABLE_GUESTS__,
     "disable_login_language_selector": false,
-    "disable_3pid_login": false,
-    "brand": "Element",
+    "disable_3pid_login": __DISABLE_3PID_LOGIN__,
+    "brand": "__BRAND_TEXT__",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
@@ -22,11 +22,11 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "default_country_code": "GB",
-    "show_labs_settings": false,
+    "default_country_code": "__DEFAULT_COUNTRY_CODE__",
+    "show_labs_settings": __SHOW_LABS_SETTINGS__,
     "features": {},
-    "default_federate": true,
-    "default_theme": "light",
+    "default_federate": __DEFAULT_FEDERATE__,
+    "default_theme": "__DEFAULT_THEME__",
     "room_directory": {
         "servers": ["matrix.org"]
     },
diff --git a/config_panel.toml b/config_panel.toml
index f75c4e6..d7f6022 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -15,3 +15,59 @@ name.fr = "Configuration d'Element"
         default = "matrix.org"
         help.en = "Define Matrix default home server address."
         help.fr = "Définir l'adresse du serveur par défaut de Matrix."
+
+        [main.config.disable_custom_urls]
+        ask.en = "Disable custom URL field on login page"
+        ask.fr = "Déactiver le champ URL personnalisé sur la page login"
+        type = "boolean"
+        yes = 'true'
+        no = 'false'
+
+        [main.config.disable_3pid_login]
+        ask.en = "Disable possibility to login with email or phone number"
+        ask.fr = "Déactiver la possibilité de s'authentifier avec un email ou no de téléphone"
+        type = "boolean"
+        yes = 'true'
+        no = 'false'
+
+        [main.config.disable_guests]
+        ask.en = "Disable guest on login page"
+        ask.fr = "Déactiver le login en tant qu'invité"
+        type = "boolean"
+        yes = 'true'
+        no = 'false'
+
+        [main.config.default_country_code]
+        ask.en = "Default country code"
+        ask.fr = "Code du pay par défaut"
+        type = "string"
+        example = "GB"
+        help.en = "By example 'FR' for France. You can refer to this page to find your favourite country code: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements"
+        help.fr = "Par example 'FR' pour la France. Vous pouvez vous référer à la page suivante afin de trouver votre pays favori: https://fr.wikipedia.org/wiki/ISO_3166-1#Table_de_codage"
+        pattern.regexp = "^[A-Z]{2}$"
+
+        [main.config.brand_text]
+        ask.en = "Branding text for the application"
+        ask.fr = "Texte de marque pour l'application"
+        type = "string"
+
+        [main.config.default_federate]
+        ask.en = "Enable fedration features by default"
+        ask.fr = "Activer les fonctionnalités de fédération par défaut"
+        type = "boolean"
+        yes = 'true'
+        no = 'false'
+
+
+        [main.config.default_theme]
+        ask.en = "Disable custom URL field on login page"
+        ask.fr = "Déactiver le champ URL personnalisé sur la page login"
+        type = "select"
+        choices = [ "light", "dark" ]
+
+        [main.config.show_labs_settings]
+        ask.en = "Show the experimental feature menu"
+        ask.fr = "Afficher le menu d'activation des fonctionnalités expérimentales"
+        type = "boolean"
+        yes = 'true'
+        no = 'false'
diff --git a/scripts/install b/scripts/install
index 06b633b..940db4a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,6 +13,23 @@ 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 --app=$app --key=disable_custom_urls --value=$disable_custom_urls
+ynh_app_setting_set --app=$app --key=disable_guests --value=$disable_guests
+ynh_app_setting_set --app=$app --key=disable_3pid_login --value=$disable_3pid_login
+ynh_app_setting_set --app=$app --key=default_country_code --value=$default_country_code
+ynh_app_setting_set --app=$app --key=brand_text --value=$brand_text
+ynh_app_setting_set --app=$app --key=default_federate --value=$default_federate
+ynh_app_setting_set --app=$app --key=default_theme --value=$default_theme
+ynh_app_setting_set --app=$app --key=show_labs_settings --value=$show_labs_settings
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index 07b0b0b..f845b4f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,12 +18,51 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+ynh_script_progression --message='Ensuring downward compatibility...' --weight=1
 
-# If default_home_server doesn't exist, create it
 if [ -z "${default_home_server:-}" ]; then
-	default_home_server="matrix.org"
-	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
+    default_home_server='matrix.org'
+    ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
+fi
+
+if [ -z "${disable_custom_urls:-}" ]; then
+    disable_custom_urls=false
+    ynh_app_setting_set --app=$app --key=disable_custom_urls --value=$disable_custom_urls
+fi
+
+if [ -z "${disable_guests:-}" ]; then
+    disable_guests=false
+    ynh_app_setting_set --app=$app --key=disable_guests --value=$disable_guests
+fi
+
+if [ -z "${disable_3pid_login:-}" ]; then
+    disable_3pid_login=false
+    ynh_app_setting_set --app=$app --key=disable_3pid_login --value=$disable_3pid_login
+fi
+
+if [ -z "${default_country_code:-}" ]; then
+    default_country_code=false
+    ynh_app_setting_set --app=$app --key=default_country_code --value=$default_country_code
+fi
+
+if [ -z "${brand_text:-}" ]; then
+    brand_text=Element
+    ynh_app_setting_set --app=$app --key=brand_text --value=$brand_text
+fi
+
+if [ -z "${default_federate:-}" ]; then
+    default_federate=true
+    ynh_app_setting_set --app=$app --key=default_federate --value=$default_federate
+fi
+
+if [ -z "${default_theme:-}" ]; then
+    default_theme=light
+    ynh_app_setting_set --app=$app --key=default_theme --value=$default_theme
+fi
+
+if [ -z "${show_labs_settings:-}" ]; then
+    show_labs_settings=false
+    ynh_app_setting_set --app=$app --key=show_labs_settings --value=$show_labs_settings
 fi
 
 #=================================================