diff --git a/src/views/profile.html b/src/views/profile.html
index 55deeb5f8..ead8b01b5 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -356,7 +356,7 @@
                     <span class="arrow">{{ password.prettyIdentifier }}</span>
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                      <button class="btn btn-xs btn-danger pull-right" ng-click="appPassword.del(password.id)" title="Delete Password"><i class="far fa-trash-alt"></i></button>
+                      <button class="btn btn-xs btn-danger pull-right" ng-click="appPassword.del.show(password.id)" title="Delete Password"><i class="far fa-trash-alt"></i></button>
                   </td>
                 </tr>
             </tbody>
@@ -366,6 +366,8 @@
     </div>
   </div>
 
+  <br/>
+
   <div class="text-left">
     <h3>Login and API Tokens <button class="btn btn-primary btn-sm pull-right" ng-click="tokens.add.show()" ng-show="user.admin"><i class="fa fa-plus"></i> New API Token</button></h3>
   </div>
@@ -393,12 +395,12 @@
                   {{ token.clientId }}
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-danger" ng-click="tokens.revoke(token)" uib-tooltip="Revoke Token"><i class="far fa-trash-alt"></i></button>
+                  <button class="btn btn-xs btn-danger" ng-click="tokens.revokeToken(token)" uib-tooltip="Revoke Token"><i class="far fa-trash-alt"></i></button>
                 </td>
               </tr>
             </tbody>
           </table>
-
+          <br/>
           <button class="btn btn-outline btn-danger pull-right" ng-click="tokens.revokeAll()">Logout From All</button>
         </div>
       </div>
diff --git a/src/views/profile.js b/src/views/profile.js
index e480b26f2..295b89495 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -512,7 +512,18 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
         },
 
         revokeAll: function () {
+            $scope.tokens.busy = true;
 
+            asyncForEach($scope.tokens.webadminTokens.concat($scope.tokens.cliTokens), function (token, callback) {
+                // do not revoke token for this session, will do at the end with logout
+                if (token.accessToken === Client.getToken()) return callback();
+
+                Client.delToken(token.id, callback);
+            }, function (error) {
+                if (error) console.error(error);
+
+                Client.logout();
+            });
         },
 
         add: {
@@ -527,6 +538,14 @@ angular.module('Application').controller('ProfileController', ['$scope', '$locat
             submit: function () {
 
             }
+        },
+
+        revokeToken: function (token) {
+            Client.delToken(token.id, function (error) {
+                if (error) console.error(error);
+
+                $scope.tokens.refresh();
+            });
         }
     };