diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 40064af..defd260 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -365,18 +365,18 @@ void WiFiManager::setupConfigPortal() {
   dnsServer->start(DNS_PORT, F("*"), WiFi.softAPIP());
 
   /* Setup httpd callbacks, web pages: root, wifi config pages, SO captive portal detectors and not found. */
-  server->on((String)F("/"), std::bind(&WiFiManager::handleRoot, this));
-  server->on((String)F("/wifi"), std::bind(&WiFiManager::handleWifi, this, true));
-  server->on((String)F("/0wifi"), std::bind(&WiFiManager::handleWifi, this, false));
-  server->on((String)F("/wifisave"), std::bind(&WiFiManager::handleWifiSave, this));
-  server->on((String)F("/info"), std::bind(&WiFiManager::handleInfo, this));
-  server->on((String)F("/param"), std::bind(&WiFiManager::handleParam, this));
-  server->on((String)F("/paramsave"), std::bind(&WiFiManager::handleParamSave, this));
-  server->on((String)F("/restart"), std::bind(&WiFiManager::handleReset, this));
-  server->on((String)F("/exit"), std::bind(&WiFiManager::handleExit, this));
-  server->on((String)F("/close"), std::bind(&WiFiManager::stopCaptivePortal, this));
-  server->on((String)F("/erase"), std::bind(&WiFiManager::handleErase, this));
-  server->on((String)F("/status"), std::bind(&WiFiManager::handleWiFiStatus, this));
+  server->on((String)FPSTR(R_root), std::bind(&WiFiManager::handleRoot, this));
+  server->on((String)FPSTR(R_wifi), std::bind(&WiFiManager::handleWifi, this, true));
+  server->on((String)FPSTR(R_wifinoscan), std::bind(&WiFiManager::handleWifi, this, false));
+  server->on((String)FPSTR(R_wifisave), std::bind(&WiFiManager::handleWifiSave, this));
+  server->on((String)FPSTR(R_info), std::bind(&WiFiManager::handleInfo, this));
+  server->on((String)FPSTR(R_param), std::bind(&WiFiManager::handleParam, this));
+  server->on((String)FPSTR(R_paramsave), std::bind(&WiFiManager::handleParamSave, this));
+  server->on((String)FPSTR(R_restart), std::bind(&WiFiManager::handleReset, this));
+  server->on((String)FPSTR(R_exit), std::bind(&WiFiManager::handleExit, this));
+  server->on((String)FPSTR(R_close), std::bind(&WiFiManager::stopCaptivePortal, this));
+  server->on((String)FPSTR(R_erase), std::bind(&WiFiManager::handleErase, this));
+  server->on((String)FPSTR(R_status), std::bind(&WiFiManager::handleWiFiStatus, this));
   //server->on("/fwlink", std::bind(&WiFiManager::handleRoot, this));  //Microsoft captive portal. Maybe not needed. Might be handled by notFound handler.
   server->onNotFound (std::bind(&WiFiManager::handleNotFound, this));
   
diff --git a/strings_en.h b/strings_en.h
index 137ecf3..d02c5ab 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -205,6 +205,20 @@ const char D_HR[]                 PROGMEM = "--------------------";
 // -----------------------------------------------------------------------------------------------
 // DO NOT EDIT BELOW THIS LINE
 
+const char R_root[]               PROGMEM = "/";
+const char R_wifi[]               PROGMEM = "/wifi";
+const char R_wifinoscan[]         PROGMEM = "/0wifi";
+const char R_wifisave[]           PROGMEM = "/wifisave";
+const char R_info[]               PROGMEM = "/info";
+const char R_param[]              PROGMEM = "/param";
+const char R_paramsave[]          PROGMEM = "/paramsave";
+const char R_restart[]            PROGMEM = "/restart";
+const char R_exit[]               PROGMEM = "/exit";
+const char R_close[]              PROGMEM = "/close";
+const char R_erase[]              PROGMEM = "/erase"; 
+const char R_status[]             PROGMEM = "/status";
+
+
 //Strings
 const char S_ip[]                 PROGMEM = "ip";
 const char S_gw[]                 PROGMEM = "gw";
@@ -212,11 +226,11 @@ const char S_sn[]                 PROGMEM = "sn";
 
 // softap ssid default prefix
 #ifdef ESP8266
-	const char S_ssidpre[]        PROGMEM = "ESP";
+	const char S_ssidpre[]          PROGMEM = "ESP";
 #elif defined(ESP32)
-	const char S_ssidpre[]        PROGMEM = "ESP32";
+	const char S_ssidpre[]          PROGMEM = "ESP32";
 #else
-	const char S_ssidpre[]        PROGMEM = "WM";
+	const char S_ssidpre[]          PROGMEM = "WM";
 #endif
 
 //Tokens