diff --git a/meshcentral.js b/meshcentral.js
index 7e25f917..666e8af2 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -3486,8 +3486,8 @@ function mainStart() {
             if (config.domains[i].sendgrid != null) { sendgrid = true; }
             if (config.domains[i].yubikey != null) { yubikey = true; }
             if (config.domains[i].auth == 'ldap') { ldap = true; }
-            if (config.domains[i].mstsc === true) { mstsc = true; }
-            if (config.domains[i].ssh === true) { if (nodeVersion < 11) { config.domains[i].ssh = false; } ssh = true; }
+            if (config.domains[i].mstsc == true) { mstsc = true; }
+            if (config.domains[i].ssh == true) { if (nodeVersion < 11) { config.domains[i].ssh = false; } else { ssh = true; } }
             if ((typeof config.domains[i].authstrategies == 'object')) {
                 if (passport == null) { passport = ['passport']; }
                 if ((typeof config.domains[i].authstrategies.twitter == 'object') && (typeof config.domains[i].authstrategies.twitter.clientid == 'string') && (typeof config.domains[i].authstrategies.twitter.clientsecret == 'string') && (passport.indexOf('passport-twitter') == -1)) { passport.push('passport-twitter'); }
diff --git a/webserver.js b/webserver.js
index 2147e12d..db629153 100644
--- a/webserver.js
+++ b/webserver.js
@@ -1105,8 +1105,6 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
 
                         // Get the HTTPS port
                         var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port if specified
-                        if (obj.args.agentport != null) { httpsPort = obj.args.agentport; } // If an agent only port is enabled, use that.
-                        if (obj.args.agentaliasport != null) { httpsPort = obj.args.agentaliasport; } // If an agent alias port is specified, use that.
 
                         // Get the agent connection server name
                         var serverName = obj.getWebServerName(domain);