diff --git a/src/js/client.js b/src/js/client.js
index 869e7741f..d46ebc28f 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1233,6 +1233,47 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.getTokens = function (callback) {
+        get('/api/v1/tokens/', null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data.tokens);
+        });
+    };
+
+    Client.prototype.createToken = function (name, callback) {
+        var data = {
+            name: name
+        };
+
+        post('/api/v1/tokens', data, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 201) return callback(new ClientError(status, data));
+
+            callback(null, data.token);
+        });
+    };
+
+    // FIXME clashes with existing getToken()
+    // Client.prototype.getToken = function (id, callback) {
+    //     get('/api/v1/tokens/' + id, null, function (error, data, status) {
+    //         if (error) return callback(error);
+    //         if (status !== 200) return callback(new ClientError(status, data));
+
+    //         callback(null, data.token);
+    //     });
+    // };
+
+    Client.prototype.delToken = function (tokenId, callback) {
+        del('/api/v1/tokens/' + tokenId, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 204) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.addAppPassword = function (identifier, name, callback) {
         var data = {
             identifier: identifier,