diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index 2b5b5b26e..c3fb1a651 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -141,11 +141,6 @@ 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 2c29d85bb..bd0a21b30 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -237,14 +237,14 @@
                                 <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>
+                                <p>Client ID: <b ng-click-select>{{ client.id }}</b></p>
+                                <p ng-show="client.clientSecret">Client Secret: <b ng-click-select>{{ client.clientSecret }}</b></p>
 
                                 <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>
+                                    <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>
                             </div>
                         </div>