diff --git a/main/main.ino b/main/main.ino
index e82fb3e5..e5e0e2b1 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -1047,7 +1047,8 @@ void eraseAndRestart() {
   Log.trace(F("Formatting requested, result: %d" CR), SPIFFS.format());
 
 #  if defined(ESP8266)
-  SPIFFS.format();
+  WiFi.disconnect(true);
+  wifiManager.resetSettings();
   delay(5000);
   ESP.reset();
 #  else
diff --git a/platformio.ini b/platformio.ini
index d30883e8..12466cc0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -112,7 +112,7 @@ ahtx0 = Adafruit AHTX0
 ina226 = https://github.com/jarzebski/Arduino-INA226.git#968a684
 a6lib = https://github.com/h2zero/A6lib
 wifimanager32 = https://github.com/tzapu/WiFiManager.git#c3ff582
-wifimanager8266 = https://github.com/tzapu/WiFiManager.git#0.16.0
+wifimanager8266 = https://github.com/tzapu/WiFiManager.git#2.0.5-beta
 ethernet = Ethernet
 esp8266_mdns = esp8266_mdns
 wire = Wire