diff --git a/htroot/Status.java b/htroot/Status.java
index 64da94883..982d59686 100644
--- a/htroot/Status.java
+++ b/htroot/Status.java
@@ -131,7 +131,7 @@ public class Status {
         }
 
         // password protection
-        if (sb.getConfig(httpd.ADMIN_ACCOUNT_B64MD5, "").length() == 0) {
+        if ((sb.getConfig(httpd.ADMIN_ACCOUNT_B64MD5, "").length() == 0) && (!sb.getConfigBool("adminAccountForLocalhost", false))) {
             prop.put("protection", "0"); // not protected
             prop.put("urgentSetPassword", "1");
         } else {