diff --git a/README.md b/README.md
index c886654..56841e6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Shipped version:** 1.11.10~ynh1
+**Shipped version:** 1.11.12~ynh1
 
 **Demo:** https://app.element.io/
 
diff --git a/README_fr.md b/README_fr.md
index 9a274fc..58a3802 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. 
 
-**Version incluse :** 1.11.10~ynh1
+**Version incluse :** 1.11.12~ynh1
 
 **Démo :** https://app.element.io/
 
diff --git a/conf/app.src b/conf/app.src
index 3305c85..32a83db 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.10/element-v1.11.10.tar.gz
-SOURCE_SUM=153853fc3f1ad3f5da791834904b107d88bb71caf573eb52a2d81bf4a34f634a
+SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.12/element-v1.11.12.tar.gz
+SOURCE_SUM=62469002d03600c220de90b6f009f4b1016d2bdeb2255145c544f3144ddd1c84
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.json b/conf/config.json
index 913a49a..f76fdf8 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -15,6 +15,8 @@
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
+    },
+    "embedded_pages": {
+        "login_for_welcome": __LOGIN_FOR_WELCOME__
     }
 }
-
diff --git a/config_panel.toml b/config_panel.toml
new file mode 100644
index 0000000..80cb82f
--- /dev/null
+++ b/config_panel.toml
@@ -0,0 +1,15 @@
+version = "1.0"
+
+[main]
+name = "Element configuration"
+
+    [main.config]
+    name = "Configuration Options"
+
+        [main.config.login_for_welcome]
+        ask = "Display login as welcome page"
+        type = "boolean"
+        yes = true
+        no = false
+        help = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
+        bind = "login_for_welcome:/var/www/__APP__/config.json"
diff --git a/manifest.json b/manifest.json
index 10f7f9a..768e835 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Web client for Matrix",
 		"fr": "Client web pour Matrix"
 	},
-	"version": "1.11.10~ynh1",
+	"version": "1.11.12~ynh1",
 	"url": "https://element.io",
 	"upstream": {
         "license": "Apache-2.0",
diff --git a/scripts/install b/scripts/install
index 39c9aec..f0f8dc9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,8 @@ default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
 
 app=$YNH_APP_INSTANCE_NAME
 
+login_for_welcome=true
+
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -47,6 +49,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=path --value=$path_url
 ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
+ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/upgrade b/scripts/upgrade
index 2d4a6b8..c259066 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,6 +21,8 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
 
+login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
+
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -52,6 +54,11 @@ if [ -z "$default_home_server" ]; then
 	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 fi
 
+if [ -z "$login_for_welcome" ]; then
+	login_for_welcome=true
+	ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
+fi
+
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
 	ynh_legacy_permissions_delete_all