diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index c3fb1a651..2b5b5b26e 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -141,6 +141,11 @@ html {
     padding: 15px 0;
 }
 
+token {
+    font-weight: bold;
+
+}
+
 // ----------------------------
 // Apps view
 // ----------------------------
diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index 72c015f7f..2c29d85bb 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -229,16 +229,23 @@
                 <div class="row">
                     <div class="col-xs-12">
                         <b>{{ client.activeTokens.length }}</b> tokens are active for this application.
-                        <button class="btn btn-xs btn-danger pull-right" ng-click="removeAccessTokens(client)" ng-disabled="!client.activeTokens.length || client.busy"><i class="fa fa-spinner fa-pulse" ng-show="client.busy"></i> Revoke access</button>
+                        <button class="btn btn-xs btn-default pull-right" ng-click="removeAccessTokens(client)" ng-disabled="!client.activeTokens.length || client.busy"><i class="fa fa-spinner fa-pulse" ng-show="client.busy"></i> Revoke access</button>
                         <br/>
                         <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse{{client.id}}" ng-show="user.admin">Advanced</a>
                         <div id="collapse{{client.id}}" class="panel-collapse collapse">
                             <div class="panel-body">
-                                <h4 class="text-muted">Credentials</h4>
+                                <hr/>
+                                <h4 class="text-muted">Credentials <button class="btn btn-xs btn-danger pull-right" ng-click="clientRemove.show(client)" title="Remove API Client" ng-show="client.location === 'external'">Remove API Client</button></h4>
                                 <p>Scope: <b>{{ client.scope }}</b></p>
                                 <p>Client ID: <b>{{ client.id }}</b></p>
                                 <p ng-show="client.clientSecret">Client Secret: <b>{{ client.clientSecret }}</b></p>
-                                <button class="btn btn-xs btn-danger pull-right" ng-click="clientRemove.show(client)" title="Remove API Client" ng-show="client.location === 'external'"><i class="fa fa-trash-o"></i> Remove API Client</button>
+
+                                <hr/>
+
+                                <h4 class="text-muted">Your Tokens</h4>
+                                <p ng-repeat="token in client.activeTokens">
+                                    <token>{{ token.accessToken }}</token> <button class="btn btn-xs btn-danger pull-right" ng-click="" title="Revoke Token"><i class="fa fa-trash-o"></i></button>
+                                </p>
                             </div>
                         </div>
                     </div>