diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index 39fd1b7..e92387b 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -1284,6 +1284,7 @@ disable_msisdn_registration: __DISABLE_MSISDN_REGISTRATION__
 # 3PIDs with accounts on this server.
 #
 allowed_local_3pids:
+__ALLOWED_LOCAL_3PIDS__
 #  - medium: email
 #    pattern: '^[^@]+@matrix\.org$'
 #  - medium: email
@@ -1395,6 +1396,7 @@ account_threepid_delegates:
 # room. The join rule of the room must be set to 'public'.
 #
 auto_join_rooms:
+__AUTO_JOIN_ROOMS__
 #  - "#example:example.com"
 
 # Where auto_join_rooms are specified, setting this flag ensures that the
@@ -1411,7 +1413,7 @@ auto_join_rooms:
 # Defaults to true. Uncomment the following line to disable automatically
 # creating auto-join rooms.
 #
-#autocreate_auto_join_rooms: false
+autocreate_auto_join_rooms: __AUTOCREATE_AUTO_JOIN_ROOMS__
 
 # Whether the auto_join_rooms that are auto-created are available via
 # federation. Only has an effect if autocreate_auto_join_rooms is true.
diff --git a/config_panel.toml b/config_panel.toml
index 29286ad..f817243 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -108,8 +108,15 @@ services = ["__APP__"]
         [client.welcome.auto_join_rooms]
         ask = "Auto Join new Users in following Rooms."
         type = "string"
-        default = '#example:example.com'
-        help = "Room should be public. If not existing, will be created as public and federated by default. Can be customised with the settings autocreate_auto_join_rooms."
+        help = "Room should be public. If not existing, will be created as public and federated by default."
+        bind = ":/etc/matrix-__APP__/homeserver.yaml"
+
+        [client.welcome.autocreate_auto_join_rooms]
+        ask = "Create room for Auto Join if not existing."
+        type = "boolean"
+        yes = true
+        no = false
+        help = "Will be created as public and federated by default. Can be customised with the settings auto_join_*."
         bind = ":/etc/matrix-__APP__/homeserver.yaml"
 
         [client.welcome.auto_join_rooms_for_guests]
diff --git a/scripts/install b/scripts/install
index e65ebdc..9655eef 100644
--- a/scripts/install
+++ b/scripts/install
@@ -106,9 +106,12 @@ allow_public_rooms_without_auth="false"
 allow_public_rooms_over_federation="false"
 disable_msisdn_registration="true"
 allowed_local_3pids=""
+#  - medium: email
+#    pattern: '^[^@]+@matrix\.org$'
 allow_guest_access="false"
 default_identity_server="https://matrix.org"
-auto_join_rooms=""
+auto_join_rooms='  - "#auto_join_room:'+$server_name+'"'
+autocreate_auto_join_rooms="false"
 auto_join_rooms_for_guests="true"
 password_enabled="true"
 enable_notifs="true"
@@ -123,6 +126,7 @@ ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_
 ynh_app_setting_set --app=$app --key=allow_guest_access --value=$allow_guest_access
 ynh_app_setting_set --app=$app --key=default_identity_server --value=$default_identity_server
 ynh_app_setting_set --app=$app --key=auto_join_rooms --value=$auto_join_rooms
+ynh_app_setting_set --app=$app --key=autocreate_auto_join_rooms --value=$autocreate_auto_join_rooms
 ynh_app_setting_set --app=$app --key=auto_join_rooms_for_guests --value=$auto_join_rooms_for_guests
 ynh_app_setting_set --app=$app --key=password_enabled --value=$password_enabled
 ynh_app_setting_set --app=$app --key=enable_notifs --value=$enable_notifs
diff --git a/scripts/upgrade b/scripts/upgrade
index d58f902..8333d15 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -68,6 +68,7 @@ allowed_local_3pids=$(ynh_app_setting_get --app=$app --key=allowed_local_3pids)
 allow_guest_access=$(ynh_app_setting_get --app=$app --key=allow_guest_access)
 default_identity_server=$(ynh_app_setting_get --app=$app --key=default_identity_server)
 auto_join_rooms=$(ynh_app_setting_get --app=$app --key=auto_join_rooms)
+autocreate_auto_join_rooms=$(ynh_app_setting_get --app=$app --key=autocreate_auto_join_rooms)
 auto_join_rooms_for_guests=$(ynh_app_setting_get --app=$app --key=auto_join_rooms_for_guests)
 password_enabled=$(ynh_app_setting_get --app=$app --key=password_enabled)
 enable_notifs=$(ynh_app_setting_get --app=$app --key=enable_notifs)
@@ -232,9 +233,14 @@ then
 fi
 if [ -z "$auto_join_rooms" ]
 then
-  auto_join_rooms=""
+  auto_join_rooms='  - "#auto_join_room:'+$server_name+'"'
   ynh_app_setting_set --app=$app --key=auto_join_rooms --value=$auto_join_rooms
 fi
+if [ -z "$autocreate_auto_join_rooms" ]
+then
+  autocreate_auto_join_rooms="false"
+  ynh_app_setting_set --app=$app --key=autocreate_auto_join_rooms --value=$autocreate_auto_join_rooms
+fi
 if [ -z "$auto_join_rooms_for_guests" ]
 then
   auto_join_rooms_for_guests="true"