diff --git a/src/views/account.js b/src/views/account.js
index 8a7f6976a..f51d57c9e 100644
--- a/src/views/account.js
+++ b/src/views/account.js
@@ -384,11 +384,12 @@ angular.module('Application').controller('AccountController', ['$scope', 'Client
             if (error) return console.error(error);
 
             asyncForEach(activeClients, refreshClientTokens, function () {
+                $scope.webadminClient = activeClients.filter(function (c) { return c.id === 'cid-webadmin'; })[0];
+                $scope.apiClient = activeClients.filter(function (c) { return c.id === 'cid-sdk'; })[0];
+
                 activeClients = activeClients.filter(function (c) { return c.activeTokens.length > 0; });
 
                 $scope.activeClients = activeClients.filter(function (c) { return c.id !== 'cid-sdk' && c.id !== 'cid-webadmin'; });
-                $scope.webadminClient = activeClients.filter(function (c) { return c.id === 'cid-webadmin'; })[0];
-                $scope.apiClient = activeClients.filter(function (c) { return c.id === 'cid-sdk'; })[0];
 
                 $scope.activeTokenCount = $scope.activeClients.reduce(function (prev, cur) { return prev + cur.activeTokens.length; }, 0);
                 $scope.activeTokenCount += $scope.webadminClient ? $scope.webadminClient.activeTokens.length : 0;