diff --git a/meshcentral.js b/meshcentral.js
index 376b29d3..1788857c 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -2331,7 +2331,7 @@ function CreateMeshCentralServer(config, args) {
         20: { id: 20, localname: 'meshagent_x86-64_nokvm', rname: 'meshagent', desc: 'Linux x86-64 NoKVM', update: true, amt: true, platform: 'linux', core: 'linux-amt', rcore: 'linux-recovery', arcore: 'linux-agentrecovery' },
         21: { id: 21, localname: 'MeshAgent-WinMinCore-Console-x86-32.exe', rname: 'meshagent.exe', desc: 'Windows MinCore Console x86-32', update: true, amt: false, platform: 'win32', core: 'windows-amt', rcore: 'windows-recovery', arcore: 'windows-agentrecovery' },
         22: { id: 22, localname: 'MeshAgent-WinMinCore-Service-x86-64.exe', rname: 'meshagent.exe', desc: 'Windows MinCore Service x86-32', update: true, amt: false, platform: 'win32', core: 'windows-amt', rcore: 'windows-recovery', arcore: 'windows-agentrecovery' },
-        23: { id: 23, localname: 'MeshAgent-NodeJS', rname: 'meshagent', desc: 'NodeJS', update: false, amt: false, platform: 'node', core: 'linux-noamt', rcore: 'linux-recovery', arcore: 'linux-agentrecovery' }, // Get this one from NPM
+        23: { id: 23, localname: 'MeshAgent-NodeJS', rname: 'meshagent', desc: 'NodeJS', update: false, amt: false, platform: 'node', core: 'nodejs', rcore: 'nodejs', arcore: 'nodejs' }, // NodeJS based agent
         24: { id: 24, localname: 'meshagent_arm-linaro', rname: 'meshagent', desc: 'Linux ARM Linaro', update: true, amt: false, platform: 'linux', core: 'linux-noamt', rcore: 'linux-recovery', arcore: 'linux-agentrecovery' },
         25: { id: 25, localname: 'meshagent_armhf', rname: 'meshagent', desc: 'Linux ARM - HardFloat', update: true, amt: false, platform: 'linux', core: 'linux-noamt', rcore: 'linux-recovery', arcore: 'linux-agentrecovery' }, // "armv6l" and "armv7l"
         26: { id: 26, localname: 'meshagent_arm64', rname: 'meshagent', desc: 'Linux ARMv8-64', update: true, amt: false, platform: 'linux', core: 'linux-noamt', rcore: 'linux-recovery', arcore: 'linux-agentrecovery' }, // "aarch64"
diff --git a/public/styles/style.css b/public/styles/style.css
index 3c56c072..1a9567ae 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -2990,8 +2990,13 @@ a {
     padding: 3px;
     border-radius: 3px;
     background-color: #DDD;
+    cursor: pointer;
 }
 
+    .traceEvent:hover {
+        background-color:#BBB;
+    }
+
 .night .traceEvent {
     background-color: #222;
 }
diff --git a/translate/translate.json b/translate/translate.json
index 6ff4c1ef..62913e0e 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -2786,7 +2786,7 @@
         "default-mobile.handlebars->container->page_content->column_l->p3->p3info->1->p3AccountActions->p2AccountSecurity->1->0",
         "default.handlebars->31->1336",
         "default.handlebars->31->1338",
-        "default.handlebars->31->2226",
+        "default.handlebars->31->2228",
         "default.handlebars->31->550",
         "default.handlebars->31->552"
       ]
@@ -5705,7 +5705,7 @@
       "zh-chs": "您确定要{0}插件吗：{1}",
       "zh-cht": "你確定要{0}外掛嗎：{1}",
       "xloc": [
-        "default.handlebars->31->2235"
+        "default.handlebars->31->2237"
       ]
     },
     {
@@ -6676,7 +6676,7 @@
       "zh-chs": "CIRA服务器",
       "zh-cht": "CIRA伺服器",
       "xloc": [
-        "default.handlebars->31->2221"
+        "default.handlebars->31->2223"
       ]
     },
     {
@@ -6696,7 +6696,7 @@
       "zh-chs": "CIRA服务器命令",
       "zh-cht": "CIRA伺服器指令",
       "xloc": [
-        "default.handlebars->31->2222"
+        "default.handlebars->31->2224"
       ]
     },
     {
@@ -6921,7 +6921,7 @@
       "zh-chs": "呼叫错误",
       "zh-cht": "呼叫錯誤",
       "xloc": [
-        "default.handlebars->31->2236"
+        "default.handlebars->31->2238"
       ]
     },
     {
@@ -7624,7 +7624,7 @@
       "zh-cht": "檢查...",
       "xloc": [
         "default.handlebars->31->1105",
-        "default.handlebars->31->2230"
+        "default.handlebars->31->2232"
       ]
     },
     {
@@ -9434,7 +9434,7 @@
       "zh-chs": "连接转发器",
       "zh-cht": "連接轉發器",
       "xloc": [
-        "default.handlebars->31->2220"
+        "default.handlebars->31->2222"
       ]
     },
     {
@@ -9584,7 +9584,7 @@
       "zh-chs": "Cookie编码器",
       "zh-cht": "Cookie編碼器",
       "xloc": [
-        "default.handlebars->31->2205"
+        "default.handlebars->31->2206"
       ]
     },
     {
@@ -9991,7 +9991,7 @@
       "zh-chs": "核心服务器",
       "zh-cht": "核心伺服器",
       "xloc": [
-        "default.handlebars->31->2204"
+        "default.handlebars->31->2205"
       ]
     },
     {
@@ -14806,7 +14806,7 @@
       "zh-chs": "电邮/短信流量",
       "zh-cht": "電郵/短信流量",
       "xloc": [
-        "default.handlebars->31->2213"
+        "default.handlebars->31->2214"
       ]
     },
     {
@@ -19276,7 +19276,7 @@
       "fr": "Gestionnaire Intel AMT",
       "nl": "Intel AMT beheerder",
       "xloc": [
-        "default.handlebars->31->2219"
+        "default.handlebars->31->2221"
       ]
     },
     {
@@ -19324,7 +19324,7 @@
         "default.handlebars->31->1418",
         "default.handlebars->31->1589",
         "default.handlebars->31->1597",
-        "default.handlebars->31->2218",
+        "default.handlebars->31->2220",
         "default.handlebars->31->536",
         "default.handlebars->31->594",
         "default.handlebars->31->621"
@@ -21872,7 +21872,7 @@
       "zh-chs": "减",
       "zh-cht": "減",
       "xloc": [
-        "default.handlebars->31->2238"
+        "default.handlebars->31->2240"
       ]
     },
     {
@@ -23406,7 +23406,7 @@
       "zh-chs": "主服务器信息",
       "zh-cht": "主伺服器訊息",
       "xloc": [
-        "default.handlebars->31->2207"
+        "default.handlebars->31->2208"
       ]
     },
     {
@@ -24202,7 +24202,7 @@
       "zh-chs": "MeshAgent流量",
       "zh-cht": "MeshAgent流量",
       "xloc": [
-        "default.handlebars->31->2209"
+        "default.handlebars->31->2210"
       ]
     },
     {
@@ -24222,7 +24222,7 @@
       "zh-chs": "MeshAgent更新",
       "zh-cht": "MeshAgent更新",
       "xloc": [
-        "default.handlebars->31->2210"
+        "default.handlebars->31->2211"
       ]
     },
     {
@@ -24343,7 +24343,7 @@
       "zh-chs": "MeshCentral服务器同级化",
       "zh-cht": "MeshCentral伺服器同級化",
       "xloc": [
-        "default.handlebars->31->2208"
+        "default.handlebars->31->2209"
       ]
     },
     {
@@ -24722,7 +24722,7 @@
       "zh-chs": "消息调度器",
       "zh-cht": "電郵調度器",
       "xloc": [
-        "default.handlebars->31->2206"
+        "default.handlebars->31->2207"
       ]
     },
     {
@@ -24905,7 +24905,7 @@
       "zh-chs": "更多",
       "zh-cht": "更多",
       "xloc": [
-        "default.handlebars->31->2237"
+        "default.handlebars->31->2239"
       ]
     },
     {
@@ -29129,7 +29129,7 @@
       "zh-cht": "外掛指令",
       "xloc": [
         "default.handlebars->31->211",
-        "default.handlebars->31->2234"
+        "default.handlebars->31->2236"
       ]
     },
     {
@@ -34138,7 +34138,7 @@
       "zh-chs": "服务器证书",
       "zh-cht": "伺服器憑證",
       "xloc": [
-        "default.handlebars->31->2211"
+        "default.handlebars->31->2212"
       ]
     },
     {
@@ -34158,7 +34158,7 @@
       "zh-chs": "服务器数据库",
       "zh-cht": "伺服器數據庫",
       "xloc": [
-        "default.handlebars->31->2212"
+        "default.handlebars->31->2213"
       ]
     },
     {
@@ -34354,7 +34354,13 @@
       "zh-chs": "服务器跟踪",
       "zh-cht": "伺服器追蹤",
       "xloc": [
-        "default.handlebars->31->2223"
+        "default.handlebars->31->2225"
+      ]
+    },
+    {
+      "en": "Server Tracing Event",
+      "xloc": [
+        "default.handlebars->31->2204"
       ]
     },
     {
@@ -39741,7 +39747,7 @@
       "zh-cht": "在啟用兩因素身份驗證之前，無法訪問此功能。這是額外的安全性所必需的。轉到“我的帳戶”標籤，然後查看“帳戶安全性”部分。",
       "xloc": [
         "default.handlebars->31->1339",
-        "default.handlebars->31->2227",
+        "default.handlebars->31->2229",
         "default.handlebars->31->553"
       ]
     },
@@ -40292,7 +40298,7 @@
       "zh-chs": "最新",
       "zh-cht": "最新",
       "xloc": [
-        "default.handlebars->31->2232"
+        "default.handlebars->31->2234"
       ]
     },
     {
@@ -41752,7 +41758,7 @@
       "zh-chs": "版本不兼容，请先升级您的MeshCentral",
       "zh-cht": "版本不兼容，請先升級你的MeshCentral",
       "xloc": [
-        "default.handlebars->31->2228"
+        "default.handlebars->31->2230"
       ]
     },
     {
@@ -41854,8 +41860,8 @@
       "zh-chs": "查看变更日志",
       "zh-cht": "查看變更日誌",
       "xloc": [
-        "default.handlebars->31->2231",
-        "default.handlebars->31->2233"
+        "default.handlebars->31->2233",
+        "default.handlebars->31->2235"
       ]
     },
     {
@@ -42253,8 +42259,14 @@
       "zh-chs": "网络服务器",
       "zh-cht": "網絡伺服器",
       "xloc": [
-        "default.handlebars->31->2214",
-        "default.handlebars->31->2215"
+        "default.handlebars->31->2215",
+        "default.handlebars->31->2216"
+      ]
+    },
+    {
+      "en": "Web Server HTTP Headers",
+      "xloc": [
+        "default.handlebars->31->2219"
       ]
     },
     {
@@ -42274,7 +42286,7 @@
       "zh-chs": "Web服务器请求",
       "zh-cht": "Web伺服器請求",
       "xloc": [
-        "default.handlebars->31->2216"
+        "default.handlebars->31->2217"
       ]
     },
     {
@@ -42294,7 +42306,7 @@
       "zh-chs": "Web套接字中继",
       "zh-cht": "Web插座中繼",
       "xloc": [
-        "default.handlebars->31->2217"
+        "default.handlebars->31->2218"
       ]
     },
     {
@@ -43780,7 +43792,7 @@
       "zh-chs": "\\\\'",
       "zh-cht": "\\\\'",
       "xloc": [
-        "default.handlebars->31->2229"
+        "default.handlebars->31->2231"
       ]
     },
     {
@@ -44879,7 +44891,7 @@
       "zh-chs": "servertrace.csv",
       "zh-cht": "servertrace.csv",
       "xloc": [
-        "default.handlebars->31->2225"
+        "default.handlebars->31->2227"
       ]
     },
     {
@@ -44965,7 +44977,7 @@
       "zh-chs": "时间，来源，信息",
       "zh-cht": "時間，來源，訊息",
       "xloc": [
-        "default.handlebars->31->2224"
+        "default.handlebars->31->2226"
       ]
     },
     {
diff --git a/views/default.handlebars b/views/default.handlebars
index b4ed6aa2..79939ac7 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -13637,10 +13637,23 @@
         function displayServerTrace() {
             var x = '', max = parseInt(Q('p41limitdropdown').value);
             if (serverTrace.length > max) { serverTrace.splice(max); }
-            for (var i in serverTrace) { x += '<div class=traceEvent>' + EscapeHtml(new Date(serverTrace[i].time).toLocaleTimeString()) + ' - <b>' + EscapeHtml(serverTrace[i].source.toUpperCase()) + '</b>: ' + EscapeHtml(serverTrace[i].args.join(', ')) + '</div>' }
+            for (var i in serverTrace) {
+                var args = [];
+                for (var j in serverTrace[i].args) { if (typeof serverTrace[i].args[j] == 'object') { args.push(JSON.stringify(serverTrace[i].args[j])); } else { args.push(serverTrace[i].args[j]); } }
+                x += '<div class=traceEvent onclick=showTraceEvent(' + j + ')>' + EscapeHtml(new Date(serverTrace[i].time).toLocaleTimeString()) + ' - <b>' + EscapeHtml(serverTrace[i].source.toUpperCase()) + '</b>: ' + EscapeHtml(args.join(', ')) + '</div>';
+            }
             QH('p41events', x);
         }
 
+        function showTraceEvent(i) {
+            var e = serverTrace[i], x = '';
+            if (xxdialogMode || (e == null)) return;
+            for (var i in e.args) {
+                if (typeof e.args[i] == 'object') { x += EscapeHtml(JSON.stringify(e.args[i])) + '<br /><br />'; } else { x += EscapeHtml(e.args[i]) + '<br /><br />'; }
+            }
+            setDialogMode(2, "Server Tracing Event", 1, null, '<div class=selecttext style=max-height:300px;overflow-y:auto>' + x + '</div>');
+        }
+
         function clearServerTracing() { serverTrace = []; displayServerTrace(); }
 
         function setServerTracing() {
@@ -13659,6 +13672,7 @@
             x += '<div><label><input type=checkbox id=p41c5 ' + ((serverTraceSources.indexOf('web') >= 0) ? 'checked' : '') + '>' + "Web Server" + '</label></div>';
             x += '<div><label><input type=checkbox id=p41c6 ' + ((serverTraceSources.indexOf('webrequest') >= 0) ? 'checked' : '') + '>' + "Web Server Requests" + '</label></div>';
             x += '<div><label><input type=checkbox id=p41c7 ' + ((serverTraceSources.indexOf('relay') >= 0) ? 'checked' : '') + '>' + "Web Socket Relay" + '</label></div>';
+            x += '<div><label><input type=checkbox id=p41c20 ' + ((serverTraceSources.indexOf('httpheaders') >= 0) ? 'checked' : '') + '>' + "Web Server HTTP Headers" + '</label></div>';
             //x += '<div><label><input type=checkbox id=p41c8 ' + ((serverTraceSources.indexOf('webrelaydata') >= 0) ? 'checked' : '') + '>' + "Traffic Relay 2 Data" + '</label></div>';
             x += '<div style="width:100%;border-bottom:1px solid gray;margin-bottom:5px;margin-top:5px"><b>' + "Intel&reg; AMT" + '</b></div>';
             x += '<div><label><input type=checkbox id=p41c19 ' + ((serverTraceSources.indexOf('amt') >= 0) ? 'checked' : '') + '>' + "Intel AMT manager" + '</label></div>';
@@ -13673,8 +13687,8 @@
         }
 
         function setServerTracingEx(b) {
-            var sources = [], allsources = ['cookie', 'dispatch', 'main', 'peer', 'web', 'webrequest', 'relay', 'webrelaydata', 'webrelay', 'mps', 'mpscmd', 'swarm', 'swarmcmd', 'agentupdate', 'agent', 'cert', 'db', 'email', 'amt'];
-            if (b == 1) { for (var i = 1; i < 20; i++) { try { if (Q('p41c' + i).checked) { sources.push(allsources[i - 1]); } } catch (ex) { } } }
+            var sources = [], allsources = ['cookie', 'dispatch', 'main', 'peer', 'web', 'webrequest', 'relay', 'webrelaydata', 'webrelay', 'mps', 'mpscmd', 'swarm', 'swarmcmd', 'agentupdate', 'agent', 'cert', 'db', 'email', 'amt', 'httpheaders'];
+            if (b == 1) { for (var i = 1; i < 21; i++) { try { if (Q('p41c' + i).checked) { sources.push(allsources[i - 1]); } } catch (ex) { } } }
             meshserver.send({ action: 'traceinfo', traceSources: sources });
         }
 
diff --git a/webserver.js b/webserver.js
index cf9011e4..6bcb7840 100644
--- a/webserver.js
+++ b/webserver.js
@@ -4971,6 +4971,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
 
         // Add HTTP security headers to all responses
         obj.app.use(function (req, res, next) {
+            // Useful for debugging reverse proxy issues
+            parent.debug('httpheaders', req.headers);
+
             // Set the real IP address of the request
             // If a trusted reverse-proxy is sending us the remote IP address, use it.
             var ipex = '0.0.0.0', xforwardedhost = req.headers.host;