diff --git a/amtmanager.js b/amtmanager.js
index 47e709ad..70753420 100644
--- a/amtmanager.js
+++ b/amtmanager.js
@@ -948,11 +948,12 @@ module.exports.CreateAmtManager = function(parent) {
         if (changes == true) {
             var t = Clone(dev.cira.xxEnvironementDetection);
             t['DetectionStrings'] = editEnvironmentDetectionTmp;
+            dev.cira.envclear = (editEnvironmentDetectionTmp.length == 0);
             dev.amtstack.Put('AMT_EnvironmentDetectionSettingData', t, function (stack, name, responses, status) {
                 const dev = stack.dev;
                 if (isAmtDeviceValid(dev) == false) return; // Device no longer exists, ignore this request.
                 if (status != 200) { dev.consoleMsg("Failed to set environement detection (" + status + ")."); removeAmtDevice(dev); return; }
-                dev.consoleMsg("Environment detection set.");
+                if (dev.cira.envclear) { dev.consoleMsg("Environment detection cleared."); } else { dev.consoleMsg("Environment detection set."); }
                 devTaskCompleted(dev);
             }, 0, 1);
         } else {
diff --git a/views/default.handlebars b/views/default.handlebars
index 7874e283..6b387941 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -9597,13 +9597,7 @@
                 x = addHtmlValue("Password*", '<input id=dp20amtpolicypass type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
                 x += addHtmlValue("Password*", '<input id=dp20amtpolicypass2 type=password style=width:230px maxlength=32 onchange=dp20amtValidatePolicy() onkeyup=dp20amtValidatePolicy() autocomplete=off />')
                 if ((ptype == 2) && (currentMesh.mtype == 2)) { x += addHtmlValue("Password mismatch", '<select id=dp20amtbadpass style=width:230px><option value=0>' + "Do nothing" + '</option><option value=1>' + "Reactivate Intel&reg; AMT" + '</option></select>'); }
-                if ((features & 0x400) == 0) {
-                    if (ptype == 2) {
-                        x += addHtmlValue('<span title="' + "Client Initiated Remote Access" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Don't configure" + '</option><option value=1>' + "Don't connect to server" + '</option><option value=2>' + "Connect to server" + '</option></select>');
-                    } else {
-                        x += addHtmlValue('<span title="' + "Client Initiated Remote Access" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Don't configure" + '</option><option value=2>' + "Connect to server" + '</option></select>');
-                    }
-                }
+                if ((features & 0x400) == 0) { x += addHtmlValue('<span title="' + "Client Initiated Remote Access" + '">' + "CIRA" + '</span>', '<select id=dp20amtcira style=width:230px><option value=0>' + "Don't configure" + '</option><option value=1>' + "Don't connect to server" + '</option><option value=2>' + "Connect to server" + '</option></select>'); }
                 x += '<br/><span style="font-size:10px">' + "* Leave blank to assign a random password to each device." + '</span><br/>';
                 if (currentMesh.mtype == 2) {
                     if (ptype == 2) {