diff --git a/webadmin/src/js/index.js b/webadmin/src/js/index.js
index 5bb1a1663..ee4c3aef1 100644
--- a/webadmin/src/js/index.js
+++ b/webadmin/src/js/index.js
@@ -94,6 +94,12 @@ app.filter('installSuccess', function () {
     };
 });
 
+app.filter('activeOAuthClients', function () {
+    return function (clients, user) {
+        return clients.filter(function (c) { return user.admin || (c.activeTokens && c.activeTokens.length > 0); });
+    };
+});
+
 app.filter('installationActive', function () {
     return function(app) {
         if (app.installationState === ISTATES.ERROR) return false;
diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index bfb72b2c8..72c015f7f 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -215,7 +215,7 @@
 <br/>
 
 <!-- we will always at least have the webadmin token here, so activeClients always will have one entry with at least one token -->
-<div class="card" ng-repeat="client in activeClients">
+<div class="card" ng-repeat="client in activeClients | activeOAuthClients:user">
     <div class="grid-item-top">
         <div class="row">
             <div class="col-xs-12">