diff --git a/mautrix_telegram/__main__.py b/mautrix_telegram/__main__.py
index 6c17faee..7e0f0818 100644
--- a/mautrix_telegram/__main__.py
+++ b/mautrix_telegram/__main__.py
@@ -100,7 +100,6 @@ appserv = AppService(config["homeserver.address"], config["homeserver.domain"],
})
bot = init_bot(config)
context = Context(appserv, config, loop, session_container, bot)
-context.mx = MatrixHandler(context)
if config["appservice.public.enabled"]:
public_website = PublicBridgeWebsite(loop)
@@ -113,6 +112,8 @@ if config["appservice.provisioning.enabled"]:
provisioning_api.app)
context.provisioning_api = provisioning_api
+context.mx = MatrixHandler(context)
+
with appserv.run(config["appservice.hostname"], config["appservice.port"]) as start:
start_ts = time()
init_db(db_engine)
diff --git a/mautrix_telegram/web/public/login.html.mako b/mautrix_telegram/web/public/login.html.mako
index b92718fc..fa4f0924 100644
--- a/mautrix_telegram/web/public/login.html.mako
+++ b/mautrix_telegram/web/public/login.html.mako
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see