diff --git a/conf/config.json b/conf/config.json
index 7a5b772..913a49a 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,5 +1,8 @@
 {
-    "default_server_name": "__DEFAULT_HOME_SERVER__",
+    "default_server_config": {
+        "m.homeserver": { "base_url": "https://__DEFAULT_HOME_SERVER__" },
+        "m.identity_server": {"base_url": "https://vector.im"}
+    },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
diff --git a/config_panel.toml b/config_panel.toml
index 577ee16..544088f 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -11,4 +11,4 @@ name = "Element configuration"
         type = "string"
         default = "matrix.org"
         help = "Choose your default Matrix server's domain name. Default is matrix.org"
-        bind = "default_server_name:__FINALPATH__/config.json"
+        bind = "m.homeserver:__FINALPATH__/config.json"