diff --git a/conf/config.yaml b/conf/config.yaml
index 71b538b..2e05b11 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -50,7 +50,7 @@ appservice:
 
     # The unique ID of this appservice.
     #id: whatsapp
-    id: __BOTNAME__
+    id: __APPSERVICEID__
     # Appservice bot details.
     bot:
         # Username of the appservice bot.
diff --git a/scripts/install b/scripts/install
index a62eee3..2d85424 100755
--- a/scripts/install
+++ b/scripts/install
@@ -24,6 +24,7 @@ ynh_abort_if_errors
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
+appserviceid=$YNH_APP_INSTANCE_NAME
 botname=$YNH_APP_ARG_BOTNAME
 bot_synapse_adm=$YNH_APP_ARG_BOT_SYNAPSE_ADM
 encryption=$YNH_APP_ARG_ENCRYPTION
@@ -76,6 +77,7 @@ 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=server_name --value=$server_name
+ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid
 ynh_app_setting_set --app=$app --key=botname --value=$botname
 ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance
 ynh_app_setting_set --app=$app --key=bot_synapse_adm --value=$bot_synapse_adm
diff --git a/scripts/remove b/scripts/remove
index 86bceee..34484fc 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance)
+appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid)
 botname=$(ynh_app_setting_get --app=$app --key=botname)
 botadmin=$(ynh_app_setting_get --app=$app --key=botadmin)
 port=$(ynh_app_setting_get --app=$app --key=port)
diff --git a/scripts/restore b/scripts/restore
index 9bea70f..4815fa6 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,6 +31,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)
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
+appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid)
 botname=$(ynh_app_setting_get --app=$app --key=botname)
 synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance)
 bot_synapse_adm=$(ynh_app_setting_get --app=$app --key=bot_synapse_adm)
diff --git a/scripts/upgrade b/scripts/upgrade
index aac2b86..127fa65 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 port=$(ynh_app_setting_get --app=$app --key=port)
+appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid)
 botname=$(ynh_app_setting_get --app=$app --key=botname)
 synapse_instance=$(ynh_app_setting_get --app=$app --key=synapse_instance)
 encryption=$(ynh_app_setting_get --app=$app --key=encryption)
@@ -87,6 +88,14 @@ then
     ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 fi
 
+# If appserviceid doesn't exist, create it
+if [ -z "$appserviceid" ]
+then
+  appserviceid=$app
+  ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid
+fi
+
+
 # If db_name doesn't exist, create it
 #if [ -z "$mautrix_whatsapp_db_name" ]; then
 #	mautrix_whatsapp_db_name=$(ynh_sanitize_dbid --db_name=$app)