diff --git a/TracyDebugger.module.php b/TracyDebugger.module.php
index 384f50d..d57c650 100644
--- a/TracyDebugger.module.php
+++ b/TracyDebugger.module.php
@@ -27,7 +27,7 @@ public static function getModuleInfo() {
             'summary' => __('Tracy debugger from Nette with many PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/forum/58-tracy-debugger/',
-            'version' => '4.26.36',
+            'version' => '4.26.37',
             'autoload' => 100000, // in PW 3.0.114+ higher numbers are loaded first - we want Tracy first
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',
@@ -1801,6 +1801,12 @@ public function ready() {
                     $pass = new Password();
                     $challenge = $pass->randomBase64String(32);
                     $this->wire('session')->tracyUserSwitcherId = $challenge;
+
+                    $configData = $this->wire('modules')->getModuleConfigData("TracyDebugger");
+                    $this->data['originalUserSwitcher'][$this->wire('session')->tracyUserSwitcherId] = $this->wire('user')->name;
+                    $configData['originalUserSwitcher'] = $this->data['originalUserSwitcher'];
+                    $this->wire('modules')->saveModuleConfigData($this, $configData);
+
                 }
                 // save session ID and expiry time in module config settings
                 $configData = $this->wire('modules')->getModuleConfigData("TracyDebugger");
@@ -1831,6 +1837,18 @@ public function ready() {
                 $this->wire('modules')->saveModuleConfigData($this, $configData);
                 $this->wire('session')->redirect($this->httpReferer);
             }
+            // if session not expired, switch to original user
+            elseif($this->wire('input')->post->revertOriginalUserSwitcher && $this->wire('session')->CSRF->validate()) {
+                if(isset($this->data['userSwitchSession'][$this->wire('session')->tracyUserSwitcherId]) && $this->data['userSwitchSession'][$this->wire('session')->tracyUserSwitcherId] > time() && $this->wire('session')->tracyUserSwitcherId) {
+                    // if session variable exists, grab it and add to the new session after logging out
+                    // and forceLogin the original user
+                    $tracyUserSwitcherId = $this->wire('session')->tracyUserSwitcherId;
+                    if($this->wire('user')->isLoggedin()) $this->wire('session')->logout();
+                    $this->wire('session')->forceLogin($this->data['originalUserSwitcher'][$tracyUserSwitcherId]);
+                    $this->wire('session')->tracyUserSwitcherId = $tracyUserSwitcherId;
+                }
+                $this->wire('session')->redirect($this->httpReferer);
+            }
             // if session not expired, switch to requested user
             elseif($this->wire('input')->post->userSwitcher && $this->wire('session')->CSRF->validate()) {
                 if(isset($this->data['userSwitchSession'][$this->wire('session')->tracyUserSwitcherId]) && $this->data['userSwitchSession'][$this->wire('session')->tracyUserSwitcherId] > time() && $this->wire('session')->tracyUserSwitcherId) {
@@ -1838,7 +1856,7 @@ public function ready() {
                     // and forceLogin the new switched user
                     $tracyUserSwitcherId = $this->wire('session')->tracyUserSwitcherId;
                     if($this->wire('user')->isLoggedin()) $this->wire('session')->logout();
-                    $user = $this->wire('session')->forceLogin($this->wire('input')->post->userSwitcher);
+                    $this->wire('session')->forceLogin($this->wire('input')->post->userSwitcher);
                     $this->wire('session')->tracyUserSwitcherId = $tracyUserSwitcherId;
                 }
                 $this->wire('session')->redirect($this->httpReferer);
diff --git a/panels/RequestInfoPanel.php b/panels/RequestInfoPanel.php
index a714d95..4122db8 100644
--- a/panels/RequestInfoPanel.php
+++ b/panels/RequestInfoPanel.php
@@ -439,7 +439,7 @@ public function getPanel() {
             </tr>
             <tr>
                 <td>process</td>
-                <td>'.$this->wire('page')->process.'</td>
+                <td>'.(isset($this->wire('page')->process) ? $this->wire('page')->process : $this->wire('process')).'</td>
             </tr>
             <tr>
                 <td>class</td>
@@ -511,15 +511,19 @@ public function getPanel() {
                     <td>'.date("Y-m-d H:i:s", $p->modified).'</td>
                 </tr>
                 <tr>
-                    <td>Hidden (status)</td>
+                    <td>Hidden</td>
                     <td>'. ($p->isHidden() ? "✔" : "✘") .'</td>
                 </tr>
                 <tr>
-                    <td>Unpublished (status)</td>
+                    <td>Unpublished</td>
                     <td>'. ($p->isUnpublished() ? "✔" : "✘") .'</td>
                 </tr>
                 <tr>
-                    <td>Locked (status)</td>
+                    <td>Trashed</td>
+                    <td>'. ($p->isTrash() ? "✔" : "✘") .'</td>
+                </tr>
+                <tr>
+                    <td>Locked</td>
                     <td>'. ($p->is(Page::statusLocked) ? "✔" : "✘") .'</td>
                 </tr>
             </table>';
diff --git a/panels/UserSwitcherPanel.php b/panels/UserSwitcherPanel.php
index acbd66b..4d95084 100644
--- a/panels/UserSwitcherPanel.php
+++ b/panels/UserSwitcherPanel.php
@@ -48,7 +48,7 @@ public function getPanel() {
 
         $out = '
         <h1>' . $this->icon . ' User Switcher</h1>
-        <div class="tracy-inner">
+        <div id="user-switcher-wrapper" class="tracy-inner">
             <h2>' . $this->wire('user')->name . '</h2>
             <p>
                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 548.172 548.172" style="enable-background:new 0 0 548.172 548.172;" xml:space="preserve" style="height:16px">
@@ -81,7 +81,7 @@ public function getPanel() {
 
             if(\TracyDebugger::$allowedSuperuser || $remainingSessionLength > 0) {
                 $out .= '
-                    <select onchange="this.form.submit()" name="userSwitcher" size="5" style="width:100% !important; height:90px !important">';
+                    <select id="userSwitcher" onchange="this.form.submit()" name="userSwitcher" size="5" style="width:100% !important; min-height:105px !important">';
                         if(!$this->wire('user')->isLoggedin()) $out .= '<option value="guest" style="padding: 2px; background:'.TracyDebugger::COLOR_WARN.'; color: #FFFFFF;" selected="selected">guest</option>';
 
                         if(\TracyDebugger::getDataValue('userSwitcherSelector')) {
@@ -114,10 +114,17 @@ public function getPanel() {
                         }
                 $out .= '
                     </select>
-                </p>';
+                </p>
+                <script>
+                    (new MutationObserver(() => {
+                        document.getElementById("userSwitcher").setAttribute("style","width:100% !important; min-height:105px !important; height:" + (document.getElementById("user-switcher-wrapper").clientHeight - 175) + "px !important");
+                    })).observe(document.getElementById("tracy-debug-panel-UserSwitcherPanel"), { attributes: true, attributeFilter: ["style"] });
+                </script>
+                ';
             }
 
             if($this->wire('user')->isLoggedin()) $out .= '<input type="submit" name="logoutUserSwitcher" value="Logout to Guest" />&nbsp;';
+            if($this->switchedUser && \TracyDebugger::getDataValue('originalUserSwitcher')) $out .= '<input type="submit" name="revertOriginalUserSwitcher" value="Original User" />&nbsp;';
             if($this->switchedUser) $out .= '<input type="submit" name="endSessionUserSwitcher" value="End Session" />';
 
             $out .= '