diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index 0a220c3..b5d4791 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -1285,6 +1285,8 @@ disable_msisdn_registration: __DISABLE_MSISDN_REGISTRATION__
 #
 #allowed_local_3pids:
 #  - medium: email
+#    pattern: '^[^@]+@matrix\.org$'
+#  - medium: email
 #    pattern: '^[^@]+@vector\.im$'
 #  - medium: msisdn
 #    pattern: '\+44'
@@ -1392,8 +1394,8 @@ account_threepid_delegates:
 # If the room already exists, make certain it is a publicly joinable
 # room. The join rule of the room must be set to 'public'.
 #
-auto_join_rooms:
-  - "__AUTO_JOIN_ROOMS__"
+#auto_join_rooms:
+#  - "__AUTO_JOIN_ROOMS__"
 
 # Where auto_join_rooms are specified, setting this flag ensures that the
 # the rooms exist by creating them when the first user on the
diff --git a/config_panel.toml b/config_panel.toml
index 5cd81bb..9c17b0c 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -24,31 +24,6 @@ services = ["matrix-__APP__"]
         bind = "password_config>enabled:/etc/matrix-__APP__/homeserver.yaml"
         visible = "! enable_registration"
 
-        [main.welcome.registrations_require_3pid]
-        ask = "Registration requires all following 3PID personal identifier."
-        type = "select"
-        choices = ["false","email", "msisdn", "email&msisdn"]
-        help = "Defaults to: 'email'. Phone number: 'msisdn'"
-        visible = "enable_registration"
-
-        [main.welcome.allowed_local_3pids_email]
-        ask = "Register only with given email formats."
-        type = "tags"
-        help = "'^[^@]+@matrix\.org$'"
-        visible = 'enable_registration && (registrations_require_3pid == "email" || registrations_require_3pid == "email&msisdn")'
-
-        [main.welcome.allowed_local_3pids_msisdn]
-        ask = "Register only with given phone number formats."
-        type = "tags"
-        help = "'\+33'"
-        visible = 'enable_registration && (registrations_require_3pid == "email&msisdn" || registrations_require_3pid == "msisdn")'
-
-        [main.welcome.auto_join_rooms]
-        ask = "Auto Join new Users in following Rooms:"
-        type = "tags"
-        help = "Users who register on this homeserver will automatically be joined to these rooms. If the room already exists, the join rule must be set to 'public'. See also next setting."
-        bind = ":/etc/matrix-__APP__/homeserver.yaml"
-
         [main.welcome.autocreate_auto_join_rooms]
         ask = "Auto-Create room for Auto Join if not existing?"
         type = "boolean"