diff --git a/src/views/account.html b/src/views/account.html
index bb425ebeb..077d3679a 100644
--- a/src/views/account.html
+++ b/src/views/account.html
@@ -289,12 +289,12 @@
 
   <br/>
 
-  <div class="text-left">
+  <div class="text-left" ng-show="user.admin">
     <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 -->
-  <div class="card">
+  <div class="card" ng-show="user.admin">
       <div class="grid-item-top">
           <div class="row">
               <div class="col-xs-12">
@@ -324,11 +324,11 @@
 
   <br/>
 
-  <div class="text-left">
+  <div class="text-left" ng-show="user.admin">
     <h3>Sessions</h3>
   </div>
 
-  <div class="card">
+  <div class="card" ng-show="user.admin">
       <div class="grid-item-top">
           <div class="row">
               <div class="col-xs-12">
diff --git a/src/views/account.js b/src/views/account.js
index 2af51c42b..79e9395e8 100644
--- a/src/views/account.js
+++ b/src/views/account.js
@@ -382,6 +382,8 @@ angular.module('Application').controller('AccountController', ['$scope', 'Client
     }
 
     Client.onReady(function () {
+        if (!Client.getUserInfo().admin) return;
+
         Client.getOAuthClients(function (error, activeClients) {
             if (error) return console.error(error);