diff --git a/manifest.json b/manifest.json
index 58e0b34..3f377c7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,9 +13,9 @@
         "email": "jean-baptiste@holcroft.fr"
     },
     "requirements": {
-        "yunohost": ">= 2.7.10"
+        "yunohost": ">= 3.1.0"
     },
-    "version": "1.2.8-3",
+    "version": "1.2.8~ynh4",
     "multi_instance": true,
     "services": [
     ],
diff --git a/scripts/install b/scripts/install
index 53e7f52..564524a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -44,7 +44,8 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder"
 #=================================================
 
 # Save app settings
-ynh_app_setting_set "$app" domain_mumble   "$domain"
+ynh_app_setting_set "$app" domain          "$domain"
+ynh_app_setting_set "$app" no_sso          "true"
 ynh_app_setting_set "$app" server_password "$server_password"
 ynh_app_setting_set "$app" su_passwd       "$su_passwd"
 ynh_app_setting_set "$app" welcometext     "$welcometext"
diff --git a/scripts/remove b/scripts/remove
index 2942dcd..30e8f7c 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get "$app" domain_mumble)
+domain=$(ynh_app_setting_get "$app" domain)
 port=$(ynh_app_setting_get "$app" port)
 final_path=$(ynh_app_setting_get "$app" final_path)
 
diff --git a/scripts/upgrade b/scripts/upgrade
index dd41d97..06547cc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -14,7 +14,8 @@ source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get "$app" domain_mumble)
+domain=$(ynh_app_setting_get "$app" domain)
+no_sso=$(ynh_app_setting_get "$app" no_sso)
 server_password=$(ynh_app_setting_get "$app" server_password)
 su_passwd=$(ynh_app_setting_get "$app" su_passwd)
 welcometext=$(ynh_app_setting_get "$app" welcometext)
@@ -61,7 +62,7 @@ if [ -z "$server_password" ]; then
 	ynh_app_setting_set "$app" welcometext     "$welcometext"
 	ynh_app_setting_set "$app" registerName    "$registerName"
 	ynh_app_setting_set "$app" su_passwd       "$su_passwd"
-	ynh_app_setting_set "$app" domain_mumble   "$domain"
+	ynh_app_setting_set "$app" domain          "$domain"
 
 	systemctl stop mumble-server
 	dpkg-reconfigure mumble-server --frontend=Noninteractive
@@ -72,9 +73,15 @@ fi
 # Fix SSO issue
 # https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/19
 if [ -z "$domain" ]; then
-	domain=$(ynh_app_setting_get "$app" domain)
-	ynh_app_setting_set "$app" domain_mumble "$domain"
-	ynh_app_setting_delete "$app" domain
+	domain=$(ynh_app_setting_get "$app" domain_mumble)
+	ynh_app_setting_set "$app" domain "$domain"
+	ynh_app_setting_delete "$app" domain_mumble
+fi
+
+# Fix SSO issue
+# https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/19
+if [ -z "$no_sso" ]; then
+	ynh_app_setting_set "$app" no_sso "true"
 fi
 
 # Fix multi installation