diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 49a43c61e..3fa77e650 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -542,6 +542,13 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
+    Client.prototype.getTokensByClientId = function (id, callback) {
+        $http.get(client.apiOrigin + '/api/v1/oauth/clients/' + id + '/tokens').success(function(data, status) {
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null, data.tokens);
+        }).error(defaultErrorHandler(callback));
+    };
+
     Client.prototype.delTokensByClientId = function (id, callback) {
         $http.delete(client.apiOrigin + '/api/v1/oauth/clients/' + id + '/tokens').success(function(data, status) {
             if (status !== 204) return callback(new ClientError(status, data));
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index 7eb2b70ac..629985894 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -231,6 +231,14 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
             if (error) return console.error(error);
 
             $scope.activeClients = activeClients;
+
+            $scope.activeClients.forEach(function (client) {
+                Client.getTokensByClientId(client.id, function (error, result) {
+                    if (error) console.error(error);
+
+                    client.activeTokens = result || [];
+                });
+            });
         });
     }