diff --git a/meshcentral.js b/meshcentral.js
index 49083ecb..f83da4df 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -157,7 +157,7 @@ function CreateMeshCentralServer(config, args) {
             for (i in process.argv) {
                 if (i > 0) {
                     var arg = process.argv[i];
-                    if ((arg.length > 0) && ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0))) { startArgs.push('"' + arg + '"'); } else { startArgs.push(arg); }
+                    if ((arg.length > 0) && ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0))) { startArgs.push(arg); } else { startArgs.push(arg); }
                 }
             }
             startArgs.push('--launch', process.pid);
diff --git a/package.json b/package.json
index 9f0dbf58..5db6d3c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.8-k",
+  "version": "0.3.8-l",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index 8c543084..5dad06dc 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -482,6 +482,7 @@
                         </div>
                         <div>
                             <select id="deskkeys">
+                                <option value=10>Ctrl+Alt+Del</option>
                                 <option value=5>Win</option>
                                 <option value=0>Win+Down</option>
                                 <option value=1>Win+Up</option>
@@ -495,7 +496,6 @@
                             </select>
                             <input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
                             <input id="DeskClip" style="" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
-                            <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
                             <label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>&nbsp;
                         </div>
                     </div>
@@ -4547,8 +4547,6 @@
             QE('connectbutton1h', hwonline);
             QE('deskSaveBtn', deskState == 3);
             QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
-            QV('DeskCAD', inputAllowed);
-            QE('DeskCAD', deskState == 3);
             QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on MacOS
             QE('DeskClip', deskState == 3);
             QV('DeskWD', (currentNode.agent) && (currentNode.agent.id < 5) && inputAllowed);
@@ -4971,6 +4969,8 @@
                 } else {
                     desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN, 18], [desktop.m.KeyAction.DOWN, 9], [desktop.m.KeyAction.UP, 9], [desktop.m.KeyAction.EXUP, 18]]); // MeshAgent: Alt press, 'TAB' press, 'TAB' release, Alt release
                 }
+            } else if (ks == 10) { // CTRL-ALT-DEL
+                desktop.m.sendcad();
             }
         }