diff --git a/src/views/account.html b/src/views/account.html
index 827671c1b..69d49ff44 100644
--- a/src/views/account.html
+++ b/src/views/account.html
@@ -262,7 +262,7 @@
   <br/>
 
   <div class="text-left">
-    <h3>Access Tokens <button class="btn btn-xs btn-primary btn-outline pull-right" ng-click="tokenAdd.show(apiClient)"><i class="fa fa-plus"></i> New Token</button> </h3>
+    <h3>API Tokens <button class="btn btn-xs btn-primary btn-outline pull-right" ng-click="tokenAdd.show(apiClient)"><i class="fa fa-plus"></i> New Token</button> </h3>
   </div>
 
   <!-- we will always at least have the webadmin token here, so activeClients always will have one entry with at least one token -->
@@ -271,12 +271,28 @@
           <div class="row">
               <div class="col-xs-12">
                   <p>These tokens can be used to access the <a ng-href="{{ config.webServerOrigin + '/developer/api/' }}" target="_blank">Cloudron API</a>.</p>
-                  <br/>
-                  <h4 class="text-muted">Active Tokens</h4>
-                  <hr/>
-                  <p ng-repeat="token in apiClient.activeTokens">
-                      <span ng-click-select>{{ token.accessToken }}</span> <button class="btn btn-xs btn-danger pull-right" ng-click="removeToken(apiClient, token)" title="Revoke Token"><i class="fa fa-trash-o"></i></button>
-                  </p>
+                  <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th style="width:40%">Name</th>
+                            <th style="width:55%" class="hidden-xs hidden-sm">Token</th>
+                            <th style="width: 5%" class="text-right">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="token in apiClient.activeTokens">
+                            <td class="text-left elide-table-cell">
+                                {{ token.name || '-' }}
+                            </td>
+                            <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="useredit.show(user)">
+                                <span ng-click-select>{{ token.accessToken }}</span>
+                            </td>
+                            <td class="text-right no-wrap" style="vertical-align: bottom">
+                                <button class="btn btn-xs btn-danger pull-right" ng-click="removeToken(apiClient, token)" title="Revoke Token"><i class="fa fa-trash-o"></i></button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
               </div>
           </div>
       </div>