diff --git a/app/controller/bot.js b/app/controller/bot.js
index f4663b4a..59cc8e04 100644
--- a/app/controller/bot.js
+++ b/app/controller/bot.js
@@ -25,7 +25,7 @@ const botController = {
     })
     console.log(botController.bots)
   },
-  add (user) {
+  add (user, token) {
     const bot = new Mastodon({ access_token: user.mastodon_auth.access_token, api_url: `https://${user.mastodon_instance}/api/v1/` })
     const listener = bot.stream('streaming/direct')
     listener.on('message', botController.message)
diff --git a/app/controller/user.js b/app/controller/user.js
index 5f8ccc40..bdf848ff 100644
--- a/app/controller/user.js
+++ b/app/controller/user.js
@@ -151,7 +151,7 @@ const userController = {
       const mastodon_auth = { client_id, client_secret, access_token: token }
       req.user.mastodon_auth = mastodon_auth
       await req.user.save()
-      await bot.add(token)
+      await bot.add(req.user, token)
       res.json(req.user)
     } catch (e) {
       res.json(e)
diff --git a/client/src/components/Settings.vue b/client/src/components/Settings.vue
index ea4ecce1..b5777e9b 100644
--- a/client/src/components/Settings.vue
+++ b/client/src/components/Settings.vue
@@ -31,7 +31,7 @@ export default {
 
     const user = await api.getUser()
     this.user = user
-    this.mastodon_instance = user.instance
+    this.mastodon_instance = user.mastodon_instance
   },
   methods: {
       async associate () {