diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 88d343c1..a034eb8f 100644
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index ea61c1d9..00f46359 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe
index 5d934dc4..dbc3f68e 100644
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
diff --git a/agents/MeshService.exe b/agents/MeshService.exe
index ad54c5c1..df8fc18f 100644
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe
index fbd0666d..ab9e4d34 100644
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe
index 5b6ebe96..8ef5bb3d 100644
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
diff --git a/agents/meshagent_arm b/agents/meshagent_arm
index 8cff5af3..2762eae5 100644
Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ
diff --git a/agents/meshagent_arm64 b/agents/meshagent_arm64
index 40df0512..838689ac 100644
Binary files a/agents/meshagent_arm64 and b/agents/meshagent_arm64 differ
diff --git a/agents/meshagent_armhf b/agents/meshagent_armhf
index b7479dd1..87196353 100644
Binary files a/agents/meshagent_armhf and b/agents/meshagent_armhf differ
diff --git a/agents/meshagent_mips b/agents/meshagent_mips
index 156bd163..ae3d6d01 100644
Binary files a/agents/meshagent_mips and b/agents/meshagent_mips differ
diff --git a/agents/meshagent_pogo b/agents/meshagent_pogo
index 3532e55c..cec0c6a8 100644
Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ
diff --git a/agents/meshagent_poky b/agents/meshagent_poky
index 7ec97c38..ac2a2e95 100644
Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ
diff --git a/agents/meshagent_poky64 b/agents/meshagent_poky64
index 1856e00e..25056c4e 100644
Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ
diff --git a/agents/meshagent_x86 b/agents/meshagent_x86
index 1597a8cc..ccaeba06 100644
Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ
diff --git a/agents/meshagent_x86-64 b/agents/meshagent_x86-64
index 68c8a7b0..e04b157a 100644
Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ
diff --git a/agents/meshagent_x86-64_nokvm b/agents/meshagent_x86-64_nokvm
index aa9bafb2..918d61fc 100644
Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ
diff --git a/agents/meshagent_x86_nokvm b/agents/meshagent_x86_nokvm
index 95388805..66e62a24 100644
Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ
diff --git a/package.json b/package.json
index 6a593133..01d351cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.8-m",
+  "version": "0.4.8-o",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/public/scripts/amt-terminal-0.0.2.js b/public/scripts/amt-terminal-0.0.2.js
index ce97a85b..eabce6e5 100644
--- a/public/scripts/amt-terminal-0.0.2.js
+++ b/public/scripts/amt-terminal-0.0.2.js
@@ -73,7 +73,7 @@ var CreateAmtRemoteTerminal = function (divid, options) {
     }
 
     obj.xxStateChange = function (newstate) {
-        if ((newstate == 3) && (options != null) && (options.xterm == true)) { obj.TermSendKeys(' stty rows ' + obj.height + ' cols ' + obj.width + '\n clear\n'); }
+        //if ((newstate == 3) && (options != null) && (options.xterm == true)) { obj.TermSendKeys(' stty rows ' + obj.height + ' cols ' + obj.width + '\n clear\n'); }
     }
 
     obj.ProcessData = function (str) {
diff --git a/translate/translate.json b/translate/translate.json
index 8b0d55e5..d31d1bc6 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -10434,6 +10434,13 @@
         "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->1"
       ]
     },
+    {
+      "en": "Login Shell",
+      "xloc": [
+        "default.handlebars->termShellContextMenuLinux->cxtermps",
+        "xterm.handlebars->termShellContextMenuLinux->cxtermps"
+      ]
+    },
     {
       "cs": "Neplatné přihlášení, zkontrolujte uživatelské jméno a heslo.",
       "de": "Anmeldung fehlgeschlagen, Benutzername und Passwort prüfen.",
diff --git a/views/default.handlebars b/views/default.handlebars
index 7b8f2471..e8db02ad 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -64,6 +64,7 @@
     <div id="termShellContextMenuLinux" class="contextMenu noselect" style="display:none;min-width:0px">
         <div id="cxtermnorm" class="cmtext" onclick="cmtermaction(1,event)"><b>Root Shell</b></div>
         <div id="cxtermps" class="cmtext" onclick="cmtermaction(8,event)">User Shell</div>
+        <div id="cxtermps" class="cmtext" onclick="cmtermaction(100,event)">Login Shell</div>
     </div>
     <div id="altPortContextMenu" class="contextMenu noselect" style="display:none;min-width:0px">
         <div id="cxaltport" class="cmtext" onclick="cmaltportaction(1,event)"><b>Alternate Port</b></div>
@@ -4014,7 +4015,11 @@
         }
 
         function cmtermaction(action) {
-            connectTerminal(null, 1, { protocol: action });
+            if (action < 100) {
+                connectTerminal(null, 1, { protocol: action });
+            } else if (action == 100) {
+                connectTerminal(null, 1, { protocol: 1, requireLogin: true });
+            }
         }
 
         function cmaltportaction(action) {
@@ -6343,6 +6348,7 @@
                 } else {
                     // Setup a mesh agent terminal
                     var termoptions = { protocol: ((options != null) && (typeof options.protocol == 'number'))?options.protocol:1 };
+                    if (options && options.requireLogin) { termoptions.requireLogin = true; }
                     if ([1, 2, 3, 4, 21, 22].indexOf(currentNode.agent.id) == -1) {
                         if (Q('termSizeList').value == 2) { termoptions.width = 100; termoptions.height = 30; termoptions.xterm = true; }
                         if (Q('termSizeList').value == 3) {
@@ -6363,6 +6369,7 @@
                     }
 
                     terminal = CreateAgentRedirect(meshserver, CreateAmtRemoteTerminal('Term', termoptions), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);
+                    terminal.options = termoptions;
                     terminal.debugmode = debugmode;
                     terminal.m.debugmode = debugmode;
                     terminal.m.onTitleChange = function (sender, title) { QH('termtitle', ' - ' + EscapeHtml(title)); }
diff --git a/views/xterm.handlebars b/views/xterm.handlebars
index edde4148..bde926e7 100644
--- a/views/xterm.handlebars
+++ b/views/xterm.handlebars
@@ -27,6 +27,7 @@
     <div id="termShellContextMenuLinux" class="contextMenu noselect" style="display:none;min-width:0px">
         <div id="cxtermnorm" class="cmtext" onclick="cmtermaction(1,event)"><b>Root Shell</b></div>
         <div id="cxtermps" class="cmtext" onclick="cmtermaction(8,event)">User Shell</div>
+        <div id="cxtermps" class="cmtext" onclick="cmtermaction(100,event)">Login Shell</div>
     </div>
     <div id=p11 class="noselect" style="overflow:hidden">
         <div id=deskarea0 style="position:relative">
@@ -161,11 +162,12 @@
                     if (resizeTimer) clearTimeout(resizeTimer);
                     resizeTimer = setTimeout(sendResize, 200); 
                 });
-                term.setOption('convertEol', true); // Consider \n to be \r\n, this should be taken care of by "termios"
+                //term.setOption('convertEol', true); // Consider \n to be \r\n, this should be taken care of by "termios"
 
                 // Setup a terminal tunnel to the agent
                 tunnel = CreateAgentRedirect(meshserver, CreateRemoteTunnel(tunnelUpdate, options), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);
                 tunnel.options = { cols: term.cols, rows: term.rows };
+                if (options && options.requireLogin) { tunnel.options.requireLogin = true; }
                 tunnel.Start(args.nodeid);
                 tunnel.onStateChanged = onTunnelStateChange;
                 tunnel.onConsoleMessageChange = function (server, msg) { setConsoleMsg(msg); };
@@ -245,9 +247,11 @@
         }
 
         function cmtermaction(action) {
-            //console.log('cmtermaction', action);
-            connectButton({ protocol: action })
-            //connectTerminal(null, 1, { protocol: action });
+            if (action < 100) {
+                connectButton({ protocol: action })
+            } else if (action == 100) {
+                connectButton({ protocol: 1, requireLogin: true })
+            }
         }
 
         function hideContextMenu() {