diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 13aef07f8d..4483920fbc 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -71,7 +71,7 @@
               if ($value['USER'] != $user && $value['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout/?token=<?=$_SESSION['token']?>"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
 <?php
                 } else {
 ?>
diff --git a/web/templates/admin/list_server_info.html b/web/templates/admin/list_server_info.html
index eaaf34cd72..7a131572eb 100644
--- a/web/templates/admin/list_server_info.html
+++ b/web/templates/admin/list_server_info.html
@@ -33,7 +33,7 @@
       <!-- /.l-menu -->
       <div class="l-profile">
         <a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
-        <a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
+        <a class="l-profile__logout" href="/logout/?token=<?=$_SESSION['token']?>"> <?=__('Log out')?> </a>
       </div>
       <!-- /.l-profile -->
     </div>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 7dd47577bb..4ad3daecd6 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -94,7 +94,7 @@
             <?
               if ($key == $user) {
             ?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout/?token=<?=$_SESSION['token']?>"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
 <?php
               } else {
 ?>
diff --git a/web/templates/admin/list_weblog.html b/web/templates/admin/list_weblog.html
index 0627c477ff..1ca837e28c 100644
--- a/web/templates/admin/list_weblog.html
+++ b/web/templates/admin/list_weblog.html
@@ -29,7 +29,7 @@
       <!-- /.l-menu -->
       <div class="l-profile">
         <a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
-        <a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
+        <a class="l-profile__logout" href="/logout/?token=<?=$_SESSION['token']?>"> <?=__('Log out')?> </a>
       </div>
       <!-- /.l-profile -->
     </div>
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 80bfdaf128..b4534ccdba 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -26,7 +26,7 @@
       <div class="l-profile noselect">
         <a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>">&nbsp;</a>
         <a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><?=$user?></a>
-        <a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
+        <a class="l-profile__logout" href="/logout/?token=<?=$_SESSION['token']?>"> <?=__('Log out')?> </a>
       </div>
       <!-- /.l-profile -->
     </div>
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index a9198d1d6a..abe3a76822 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -70,7 +70,7 @@
               if ($value['USER'] != $user && $value['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout/?token=<?=$_SESSION['token']?>"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
 <?php
                 } else {
  ?>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index 85ed64c33d..e6645900f6 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -89,7 +89,7 @@
             <?
               if ($key == $user) {
             ?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout/?token=<?=$_SESSION['token']?>"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
 <?php
               } else {
 ?>
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index dfb544c9f1..81cd835881 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -20,7 +20,7 @@
       <div class="l-profile">
         <a class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>">&nbsp;</a>
         <a class="l-profile__username" href="/edit/user/?user=<?php echo $user; ?>"><? if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin → ' ?><?=$user?></a>
-        <a class="l-profile__logout" href="/logout/"> <?=__('Log out')?> </a>
+        <a class="l-profile__logout" href="/logout/?token=<?=$_SESSION['token']?>"> <?=__('Log out')?> </a>
       </div>
       <!-- /.l-profile -->
     </div>