diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b3d285875..52be70e4b 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3480,7 +3480,9 @@ define([
         });
 
         $userAdmin.find('a.cp-toolbar-menu-logout-everywhere').click(function () {
-            Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () { });
+            Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () {
+                window.parent.location = origin + '/';
+            });
         });
         $userAdmin.find('a.cp-toolbar-menu-settings').click(function () {
             if (padType) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 2049fc2b5..21556d690 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -784,7 +784,7 @@ define([
             });
 
             sframeChan.on('Q_LOGOUT_EVERYWHERE', function (data, cb) {
-                Cryptpad.logoutFromAll(cb);
+                Cryptpad.logoutFromAll(Utils.Util.bake(Utils.LocalStore.logout, cb));
             });
 
             sframeChan.on('EV_NOTIFY', function (data) {