diff --git a/views/default.handlebars b/views/default.handlebars
index 44d009fe..8780e94b 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5975,13 +5975,12 @@
                     CollapsedGroups = {};
                     for (var i in nodes) {
                         var node = nodes[i];
-                        if (node.tags) {
-                            var mesh2 = meshes[node.meshid];
-                            if (mesh2) {
-                                for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name + ' - ' + node.tags[j])] = true; }
-                            } else {
-                                for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx('**INDV*~*DEVS** - ' + node.tags[j])] = true; }
-                            }
+                        var mesh2 = meshes[node.meshid];
+                        if (mesh2) {
+                            CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name)] = true;
+                            if (node.tags) { for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name + ' - ' + node.tags[j])] = true; } }
+                        } else {
+                            if (node.tags) { for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx('**INDV*~*DEVS** - ' + node.tags[j])] = true; } }
                         }
                     }
                 }
@@ -8404,7 +8403,7 @@
                     };
                     desktop.Start(desktopNode._id, 16994, '*', '*', 0);
                     desktop.contype = 2;
-                } else if ((contype == null) || (contype == 1) || ((contype == 3) && (currentNode.agent.id > 4))) {
+                } else if ((contype == null) || (contype == 1) || ((contype == 3) && (currentNode.agent.id > 4) && (debugmode != null))) {
                     // Setup the Mesh Agent remote desktop
                     desktop = CreateAgentRedirect(meshserver, CreateAgentRemoteDesktop('Desk'), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);
                     desktop.m.UseExtendedKeyFlag = (desktopNode.agent.id < 5); // Only use extended keys on Windows agents for now
diff --git a/webserver.js b/webserver.js
index 6b144ebb..7e7ac621 100644
--- a/webserver.js
+++ b/webserver.js
@@ -1776,7 +1776,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
         } else {
             // Check is email already exists
             obj.db.GetUserWithVerifiedEmail(domain.id, email, function (err, docs) {
-                if ((err != null) || (docs.length > 0 && docs.find(u => u._id === req.session.cuserid) < 0)) {
+                if ((err != null) || ((docs.length > 0) && (docs.find(function (u) { return (u._id === req.session.cuserid); }) < 0))) {
                     // Email already exitst
                     req.session.messageid = 102; // Existing account with this email address.
                 } else {