diff --git a/src/common/js/background.js b/src/common/js/background.js
index ae4fe53..7808eca 100644
--- a/src/common/js/background.js
+++ b/src/common/js/background.js
@@ -116,7 +116,9 @@ onMessage((request, sender, sendResponse) => {
     return
   }
   if (request.action == 'login') {
-    manager.kitsu.login(request.username, request.password)
+    manager.kitsu.login(request.username, request.password).then((success) => {
+      sendResponse(success)
+    })
     return
   }
   if (request.action == 'logout') {
diff --git a/src/common/js/kitsu.js b/src/common/js/kitsu.js
index 7bf97fc..68eceb0 100644
--- a/src/common/js/kitsu.js
+++ b/src/common/js/kitsu.js
@@ -74,12 +74,13 @@ class Kitsu {
   }
 
   login(username, password) {
-    this.auth.owner.getToken(username, password).then((user) => {
+    return this.auth.owner.getToken(username, password).then((user) => {
       localStorage.setItem('username', username)
       localStorage.setItem('token', user.accessToken)
       localStorage.setItem('refresh', user.refreshToken)
       this.getUser().then((user) => { localStorage.setItem('id', user.id) })
       this.authenticate(user.accessToken)
+      return true
     })
   }
 
diff --git a/src/common/js/manager.js b/src/common/js/manager.js
index fe54875..13c3b9b 100644
--- a/src/common/js/manager.js
+++ b/src/common/js/manager.js
@@ -12,7 +12,7 @@ class Manager {
         let { access_token, refresh_token } = authToken.data
         localStorage.setItem('token', access_token)
         localStorage.setItem('refresh', refresh_token)
-        this.kitsu.authenticate(token)
+        this.kitsu.authenticate(access_token)
       })
     }
   }
diff --git a/src/common/js/options.js b/src/common/js/options.js
index c85db60..a4b6913 100644
--- a/src/common/js/options.js
+++ b/src/common/js/options.js
@@ -37,7 +37,7 @@ const init = () => {
 }
 
 const loadUser = () => {
-  if (localStorage.getItem('username')) {
+  if (localStorage.getItem('token')) {
     sendMessage({ action: 'user' }, (user) => {
       avatar.src = user.avatar.medium
       name.innerHTML = user.name
@@ -100,7 +100,10 @@ loginButton.onclick = (event) => {
     action: 'login',
     username: userField.value,
     password: passField.value
-  }, loadUser())
+  }, (success) => {
+    if (success)
+      loadUser()
+  })
 }
 
 grayscale.onchange = (event) => {