diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 7630994ff..773982acc 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -549,8 +549,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.createTokenByClientId = function (id, callback) {
-        $http.post(client.apiOrigin + '/api/v1/oauth/clients/' + id + '/tokens').success(function(data, status) {
+    Client.prototype.createTokenByClientId = function (id, expiresAt, callback) {
+        $http.post(client.apiOrigin + '/api/v1/oauth/clients/' + id + '/tokens?expiresAt=' + expiresAt).success(function(data, status) {
             if (status !== 201) return callback(new ClientError(status, data));
             callback(null, data.token);
         }).error(defaultErrorHandler(callback));
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index 4e4d47d9c..17308f1a2 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -239,7 +239,9 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
             $scope.tokenAdd.busy = true;
             $scope.tokenAdd.token = {};
 
-            Client.createTokenByClientId(client.id, function (error, result) {
+            var expiresAt = Date.now() + 100 * 365 * 24 * 60 * 60 * 1000;   // ~100 years from now
+
+            Client.createTokenByClientId(client.id, expiresAt, function (error, result) {
                 if (error) console.error(error);
 
                 $scope.tokenAdd.busy = false;