diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index a540f89..34f4cf8 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -1459,55 +1459,13 @@ boolean WiFiManager::validApPassword(){
 }
 
 String WiFiManager::getWLStatusString(uint8_t status){
-  const char * const WIFI_STA_STATUS[]
-  {
-      "WL_IDLE_STATUS",
-      "WL_NO_SSID_AVAIL",
-      "WL_SCAN_COMPLETED",
-      "WL_CONNECTED",
-      "WL_CONNECT_FAILED",
-      "WL_CONNECTION_LOST",
-      "WL_DISCONNECTED"
-  };
-
   if(status >=0 && status <=6) return WIFI_STA_STATUS[status];
-  return F("UNKNOWN");
+  return FPSTR(S_NA);
 }
 
 String WiFiManager::encryptionTypeStr(uint8_t authmode) {
-    #ifdef ESP8266
-      switch(authmode) {
-          case ENC_TYPE_NONE:
-              return "None";
-          case ENC_TYPE_WEP:
-              return "WEP";
-          case ENC_TYPE_TKIP:
-              return "WPA_PSK";
-          case ENC_TYPE_CCMP:
-              return "WPA2_PSK";
-          case ENC_TYPE_AUTO:
-              return "WPA_WPA2_PSK";
-          default:
-              return "Unknown";
-      }
-    #elif defined(ESP32)
-      switch(authmode) {
-          case WIFI_AUTH_OPEN:
-              return "None";
-          case WIFI_AUTH_WEP:
-              return "WEP";
-          case WIFI_AUTH_WPA_PSK:
-              return "WPA_PSK";
-          case WIFI_AUTH_WPA_WPA2_PSK:
-              return "WPA2_PSK";
-          case WIFI_AUTH_WPA2_ENTERPRISE:
-              return "WPA_WPA2_ENTERPRISE";
-          case WIFI_AUTH_MAX:
-              return "MAX";
-          default:
-              return "Unknown";
-      }
-    #endif
+  // DEBUG_WM("enc_tye: ",authmode);
+  return AUTH_MODE_NAMES[authmode];
 }
 
 // set mode ignores WiFi.persistent 
diff --git a/WiFiManager.h b/WiFiManager.h
index 0195781..8633d07 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -324,7 +324,7 @@ class WiFiManager
       return  obj->fromString(s);
     }
     auto optionalIPFromString(...) -> bool {
-      DEBUG_WM("NO fromString METHOD ON IPAddress, you need ESP8266 core 2.1.0 or newer for Custom IP configuration to work.");
+      // DEBUG_WM("NO fromString METHOD ON IPAddress, you need ESP8266 core 2.1.0 or newer for Custom IP configuration to work.");
       return false;
     }
 };
diff --git a/strings_en.h b/strings_en.h
index 344c862..e5773a5 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -139,6 +139,7 @@ const char S_enable[]             PROGMEM = "Enabled";
 const char S_disable[]            PROGMEM = "Disabled";
 const char S_GET[]                PROGMEM = "GET";
 const char S_POST[]               PROGMEM = "POST";
+const char S_NA[]                 PROGMEM = "Unknown";
 
 const char S_titlewifisaved[]     PROGMEM = "Credentials Saved"; // @token titlewifisaved
 const char S_titlewifi[]          PROGMEM = "Config ESP"; // @token titlewifi
@@ -193,4 +194,41 @@ const char T_R[]                  PROGMEM = "{R}"; // @token R
 // http
 const char HTTP_HEAD_CL[]         PROGMEM = "Content-Length";
 const char HTTP_HEAD_CT[]         PROGMEM = "text/html";
-const char HTTP_HEAD_CT2[]        PROGMEM = "text/plain";
\ No newline at end of file
+const char HTTP_HEAD_CT2[]        PROGMEM = "text/plain";
+
+const char * const WIFI_STA_STATUS[] PROGMEM
+{
+  "WL_IDLE_STATUS",
+  "WL_NO_SSID_AVAIL",
+  "WL_SCAN_COMPLETED",
+  "WL_CONNECTED",
+  "WL_CONNECT_FAILED",
+  "WL_CONNECTION_LOST",
+  "WL_DISCONNECTED"
+};
+
+#ifdef ESP32
+const char * const AUTH_MODE_NAMES[] PROGMEM
+{
+    "OPEN",
+    "WEP",             
+    "WPA_PSK",         
+    "WPA2_PSK",        
+    "WPA_WPA2_PSK",    
+    "WPA2_ENTERPRISE", 
+    "MAX"
+};
+#elif defined(ESP8266)
+const char * const AUTH_MODE_NAMES[] PROGMEM
+{
+    "",
+    "",
+    "WPA_PSK",      // 2 ENC_TYPE_TKIP
+    "",
+    "WPA2_PSK",     // 4 ENC_TYPE_CCMP
+    "WEP",          // 5 ENC_TYPE_WEP
+    "",
+    "OPEN",         //7 ENC_TYPE_NONE
+    "WPA_WPA2_PSK", // 8 ENC_TYPE_AUTO
+};
+#endif
\ No newline at end of file