diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index c866bf7..c6224d3 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -50,7 +50,7 @@ tls_fingerprints: []
 # This is used by remote servers to connect to this server,
 # e.g. matrix.org, localhost:8080, etc.
 # This is also the last part of your UserID.
-server_name: "__DOMAIN__"
+server_name: "__SERVER_NAME__"
 
 # When running as a daemon, the file to store the pid in
 pid_file: "/var/run/matrix-__APP__.pid"
diff --git a/manifest.json b/manifest.json
index 9ba3cb1..1530096 100644
--- a/manifest.json
+++ b/manifest.json
@@ -29,6 +29,15 @@
 					"en": "Choose a domain for Synapse",
 					"fr": "Choisissez un domaine pour Synapse"
 				},
+				"example": "matrix.domain.org"
+			},
+			{
+				"name": "server_name",
+				"type": "string",
+				"ask": {
+					"en": "Choose a name for Matrix accounts",
+					"fr": "Choisissez un nom pour les comptes Matrix"
+				},
 				"example": "domain.org"
 			},
 			{
diff --git a/scripts/install b/scripts/install
index 1cf481b..8d20035 100644
--- a/scripts/install
+++ b/scripts/install
@@ -32,6 +32,7 @@ report_stats="False"
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
+server_name=$YNH_APP_ARG_SERVER_NAME
 is_public=$YNH_APP_ARG_IS_PUBLIC
 path_url="/_matrix"
 final_path="/opt/yunohost/matrix-$app"
@@ -228,6 +229,7 @@ cp ../conf/log.yaml /etc/matrix-$app/log.yaml
 
 ynh_replace_string __APP__ $app "$homeserver_config_path"
 ynh_replace_string __DOMAIN__ $domain "$homeserver_config_path"
+ynh_replace_string __SERVER_NAME__ $server_name "$homeserver_config_path"
 ynh_replace_string __SYNAPSE_DB_USER__ $synapse_db_user "$homeserver_config_path"
 ynh_replace_string __SYNAPSE_DB_PWD__ $synapse_db_pwd "$homeserver_config_path"
 ynh_replace_string __PORT__ $port "$homeserver_config_path"