diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index f07a28833..3868da001 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -549,6 +549,13 @@ 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) {
+            if (status !== 201) return callback(new ClientError(status, data));
+            callback(null, data.token);
+        }).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));
diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index bd0a21b30..7d9a5bf2b 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -163,6 +163,23 @@
     </div>
 </div>
 
+<!-- Modal add token -->
+<div class="modal fade" id="tokenAddModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">New token created</h4>
+            </div>
+            <div class="modal-body">
+                <b ng-click-select>{{ tokenAdd.token.accessToken }}</b>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Done</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <br/>
 
 <div class="section-header">
@@ -242,7 +259,7 @@
 
                                 <hr/>
 
-                                <h4 class="text-muted">Your Tokens</h4>
+                                <h4 class="text-muted">Your Tokens <button class="btn btn-xs btn-primary btn-outline pull-right" ng-click="tokenAdd.show()"><i class="fa fa-plus"></i> New Token</button></h4>
                                 <p ng-repeat="token in client.activeTokens">
                                     <b ng-click-select>{{ token.accessToken }}</b> <button class="btn btn-xs btn-danger pull-right" ng-click="" title="Revoke Token"><i class="fa fa-trash-o"></i></button>
                                 </p>
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index 1800d26c9..e92c5974b 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -231,6 +231,27 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
         }
     };
 
+    $scope.tokenAdd = {
+        busy: false,
+        token: {},
+
+        show: function (client) {
+            $scope.tokenAdd.busy = true;
+            $scope.tokenAdd.token = {};
+
+            Client.createTokenByClientId(client.id, function (error, result) {
+                if (error) console.error(error);
+
+                $scope.tokenAdd.busy = false;
+                $scope.tokenAdd.token = result;
+
+                $('#tokenAddModal').modal('show');
+
+                // refresh token list
+            });
+        }
+    };
+
     $scope.removeAccessTokens = function (client) {
         client.busy = true;