diff --git a/telegram/commands.py b/telegram/commands.py
index 6d723fb..64fd957 100644
--- a/telegram/commands.py
+++ b/telegram/commands.py
@@ -19,7 +19,7 @@ class StartCommand(TelegramCommand):
 
     user_add(username, chat_id)
 
-    yield "Welcome to Gear Orders bot.\n\nEdit your orders at {FLASK_URL}\n\nAdd a dom with `/dom_add <username>` or ask a sub to add you."
+    yield f"Welcome to Gear Orders bot.\n\nEdit your orders at {FLASK_URL}\n\nAdd a dom with `/dom_add <username>` or ask a sub to add you."
 
 class DomAddCommand(TelegramCommand):
   command_text = "/dom_add"
diff --git a/web/api.py b/web/api.py
index a74b286..1d16b26 100644
--- a/web/api.py
+++ b/web/api.py
@@ -19,7 +19,7 @@ def me():
   return jsonify({
     "username": user.telegram_username,
     "telegram_photo_url": user.telegram_photo_url,
-    "mastodon_server": user.mastodon_server.name,
+    "mastodon_server": user.mastodon_server.name if user.mastodon_server else None,
     "mastodon_username": user.mastodon_username,
     "mastodon_attn_list": user.mastodon_attn_list,
     "mastodon_post_public": user.mastodon_post_public
diff --git a/web/templates/dashboard.html b/web/templates/dashboard.html
index 027655f..0e753e5 100644
--- a/web/templates/dashboard.html
+++ b/web/templates/dashboard.html
@@ -7,7 +7,7 @@
 
     <title>Gear Orders Bot</title>
 
-    {{ vite_entry('src/main.tsx') | safe }}
+    {{ vite_entry('src/main.tsx') }}
 
   </head>