diff --git a/conf/base.config.yaml b/conf/base.config.yaml
index 4ce0bef..b238165 100644
--- a/conf/base.config.yaml
+++ b/conf/base.config.yaml
@@ -11,7 +11,7 @@ bridge:
   bindAddress: localhost
 
   # Public domain of the homeserver
-  domain: __DOMAIN__
+  domain: __USER_DOMAIN__
 
   # Reachable URL of the Matrix homeserver
   homeserverUrl: https://__DOMAIN__
diff --git a/manifest.json b/manifest.json
index a4e7f29..06ebe43 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,8 @@
         "email": "florent.git@zeteo.me"
     },
     "requirements": {
-        "yunohost": ">= 4.1.0"
+        "yunohost": ">= 4.1.0",
+        "synapse": ">=1.0.0"
     },
     "multi_instance": true,
     "services": [
@@ -32,13 +33,15 @@
                 "name": "synapsenumber",
                 "type": "string",
                 "ask": {
-                    "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge",
-                    "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix"
+                    "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge.",
+                    "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix.",
+                    "es": "Elije el numero de la instancia que se communicara con esta passarella Discord."
                 },
                 "example": "2 (for instance synapse__2)",
                 "help": {
                     "en": "If you installed synapse only once time, then leave default value 1.",
-                    "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1."
+                    "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1.",
+                    "es": "Si synapse esta installado una sola vez, deje el valor en 1. "
                 },
                 "default": "1"
             }
diff --git a/scripts/backup b/scripts/backup
index 76e3ea0..8655c7c 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -29,6 +29,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
+user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 log_path=$(ynh_app_setting_get --app=$app --key=log_path)
 etc_path=$(ynh_app_setting_get --app=$app --key=etc_path)
diff --git a/scripts/install b/scripts/install
index 5ebea9e..df240cb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -45,6 +45,7 @@ fi
 
 server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
 domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
+user_domain=$(ynh_app_setting_get --app=$synapse_instance --key=server_name)
 app_service_registration_path="/etc/matrix-$synapse_instance/app-service"
 log_path="/var/log/$app"
 base_config_path="$final_path/base.config.yaml"
@@ -63,6 +64,7 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
 ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
+ynh_app_setting_set --app=$app --key=user_domain --value=$user_domain
 ynh_app_setting_set --app=$app --key=log_path --value=$log_path
 ynh_app_setting_set --app=$app --key=app_service_registration_path --value=$app_service_registration_path
 ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance
@@ -151,7 +153,7 @@ ynh_app_setting_set --app=$app --key=etc_path --value=$etc_path
 mkdir -p -m 750 "$etc_path"
 chown "$app:$app" "$etc_path"
 
-any_account_of_domain="@.*:${domain//\./\\\.}"
+any_account_of_domain="@.*:${user_domain//\./\\\.}"
 
 # TODO Add a way to override the config.yaml file
 ynh_add_config --template="base.config.yaml" --destination="$base_config_path"
diff --git a/scripts/remove b/scripts/remove
index 44f0e8f..eb5e716 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
+user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
 port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
diff --git a/scripts/restore b/scripts/restore
index eef7b48..9494bbf 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
+user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
diff --git a/scripts/upgrade b/scripts/upgrade
index 0df0ba7..9ae25e1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
+user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
@@ -32,6 +33,11 @@ user_config_path="$etc_path/user.config.yaml"
 pip_path="$final_path/.pip"
 app_service_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path)
 
+if [ -z "$user_domain" ]; then
+	user_domain=$domain
+	ynh_app_setting_set --app=$app --key=user_domain --value=$domain
+fi
+
 #=================================================
 # CHECK VERSION
 #=================================================