diff --git a/src/background.js b/src/background.js
index 1a3e45dba0..c573fd6860 100644
--- a/src/background.js
+++ b/src/background.js
@@ -436,19 +436,21 @@ var bg_isBackground = true,
             return;
         }
 
-        bg_userService.isAuthenticated(function (isAuthenticated) {
-            bg_cryptoService.getKey().then(function (key) {
-                var suffix = '';
-                if (!isAuthenticated) {
-                    suffix = '_gray';
-                }
-                else if (!key) {
-                    suffix = '_locked';
-                }
+        var isAuthenticated;
+        bg_userService.isAuthenticated().then(function (theIsAuthenticated) {
+            isAuthenticated = theIsAuthenticated;
+            return bg_cryptoService.getKey();
+        }).then(function (key) {
+            var suffix = '';
+            if (!isAuthenticated) {
+                suffix = '_gray';
+            }
+            else if (!key) {
+                suffix = '_locked';
+            }
 
-                actionSetIcon(chrome.browserAction, suffix);
-                actionSetIcon(bg_sidebarAction, suffix);
-            });
+            actionSetIcon(chrome.browserAction, suffix);
+            actionSetIcon(bg_sidebarAction, suffix);
         });
 
         function actionSetIcon(theAction, suffix) {
diff --git a/src/popup/app/config.js b/src/popup/app/config.js
index b5b29d9c92..176c19f2fd 100644
--- a/src/popup/app/config.js
+++ b/src/popup/app/config.js
@@ -23,20 +23,22 @@ angular
             var userService = $injector.get('userService');
             var cryptoService = $injector.get('cryptoService');
 
-            cryptoService.getKey().then(function (key) {
-                userService.isAuthenticated(function (isAuthenticated) {
-                    if (isAuthenticated) {
-                        if (!key) {
-                            $state.go('lock');
-                        }
-                        else {
-                            $state.go('tabs.current');
-                        }
+            var key;
+            cryptoService.getKey().then(function (theKey) {
+                key = theKey;
+                return userService.isAuthenticated();
+            }).then(function (isAuthenticated) {
+                if (isAuthenticated) {
+                    if (!key) {
+                        $state.go('lock');
                     }
                     else {
-                        $state.go('home');
+                        $state.go('tabs.current');
                     }
-                });
+                }
+                else {
+                    $state.go('home');
+                }
             });
         });
 
@@ -269,7 +271,7 @@ angular
 
         stateService.init();
 
-        $transitions.onStart({}, function(trans) {
+        $transitions.onStart({}, function (trans) {
             const $state = trans.router.stateService;
             const toState = trans.to();
 
@@ -284,7 +286,7 @@ angular
                 return;
             }
 
-            userService.isAuthenticated((isAuthenticated) => {
+            userService.isAuthenticated().then((isAuthenticated) => {
                 if (isAuthenticated) {
                     var obj = {};
                     obj[constantsService.lastActiveKey] = (new Date()).getTime();
diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js
index d185f68cff..157ae9decd 100644
--- a/src/popup/app/lock/lockController.js
+++ b/src/popup/app/lock/lockController.js
@@ -24,7 +24,7 @@ angular
         };
 
         $scope.submit = function () {
-            userService.getEmail(function (email) {
+            userService.getEmail().then(function (email) {
                 var key = cryptoService.makeKey($scope.masterPassword, email);
                 var keyHash;
                 cryptoService.hashPassword($scope.masterPassword, key).then(function (theKeyHash) {
diff --git a/src/popup/app/tools/toolsExportController.js b/src/popup/app/tools/toolsExportController.js
index d03bb2e6c6..5a366596ec 100644
--- a/src/popup/app/tools/toolsExportController.js
+++ b/src/popup/app/tools/toolsExportController.js
@@ -22,7 +22,7 @@ angular
         function checkPassword() {
             var deferred = $q.defer();
 
-            userService.getEmail(function (email) {
+            userService.getEmail().then(function (email) {
                 var key = cryptoService.makeKey($scope.masterPassword, email);
                 var keyHash;
                 cryptoService.hashPassword($scope.masterPassword, key).then(function (theKeyHash) {
diff --git a/src/services/syncService.js b/src/services/syncService.js
index 4c4172e822..2ffb7c33e4 100644
--- a/src/services/syncService.js
+++ b/src/services/syncService.js
@@ -21,7 +21,7 @@ function initSyncService() {
         var self = this;
 
         self.syncStarted();
-        self.userService.isAuthenticated(function (isAuthenticated) {
+        self.userService.isAuthenticated().then(function (isAuthenticated) {
             if (!isAuthenticated) {
                 self.syncCompleted(false);
                 callback(false);
diff --git a/src/services/user.service.ts b/src/services/user.service.ts
index 6a4059066d..060eb78223 100644
--- a/src/services/user.service.ts
+++ b/src/services/user.service.ts
@@ -31,7 +31,6 @@ export default class UserService {
         return UtilsService.saveObjToStorage(Keys.stamp, stamp);
     }
 
-    // TODO: callbacks
     async getUserId(): Promise<string> {
         if (this.userId != null) {
             return this.userId;
@@ -41,7 +40,6 @@ export default class UserService {
         return this.userId;
     }
 
-    // TODO: callbacks
     async getEmail(): Promise<string> {
         if (this.email != null) {
             return this.email;
@@ -70,7 +68,6 @@ export default class UserService {
         this.userId = this.email = this.stamp = null;
     }
 
-    // TODO: fix callbacks
     async isAuthenticated(): Promise<boolean> {
         const token = await this.tokenService.getToken();
         if (token == null) {