diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 39b060289..c2ee44a65 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,4 +1,7 @@
-/* 6.3.0.6 20181110
+/* 6.3.0.7 20181111
+ * Fix wifi connection errors using ESP.reset instead of ESP.restart
+ *
+ * 6.3.0.6 20181110
  * Change GUI Configure Module by using AJAX for data fetch to cut page size (and memory use) by 40%
  *   In case of web page errors clear your browser cache or do Page Reload (F5 or Ctrl+R)
  *
diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
index 7f25e0ebc..14eee4f25 100644
--- a/sonoff/sonoff_version.h
+++ b/sonoff/sonoff_version.h
@@ -20,7 +20,7 @@
 #ifndef _SONOFF_VERSION_H_
 #define _SONOFF_VERSION_H_
 
-#define VERSION            0x06030006
+#define VERSION            0x06030007
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"
diff --git a/sonoff/support.ino b/sonoff/support.ino
index bbc81b1a3..9389714ec 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -1577,15 +1577,15 @@ int WifiState()
 void WifiConnect()
 {
   WifiSetState(0);
-  WiFi.persistent(false);    // Solve possible wifi init errors
+  WiFi.persistent(false);     // Solve possible wifi init errors
   wifi_status = 0;
   wifi_retry_init = WIFI_RETRY_OFFSET_SEC + ((ESP.getChipId() & 0xF) * 2);
   wifi_retry = wifi_retry_init;
   wifi_counter = 1;
 }
 
-/*
 // Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0
+// Re-enabled from 6.3.0.7 with ESP.restart replaced by ESP.reset
 void WifiDisconnect()
 {
   // Courtesy of EspEasy
@@ -1598,17 +1598,18 @@ void WifiDisconnect()
 
 void EspRestart()
 {
-  // This results in exception 3 on restarts
   delay(100);                 // Allow time for message xfer - disabled v6.1.0b
   WifiDisconnect();
-  ESP.restart();
+//  ESP.restart();            // This results in exception 3 on restarts on core 2.3.0
+  ESP.reset();
 }
-*/
 
+/*
 void EspRestart()
 {
   ESP.restart();
 }
+*/
 
 /*********************************************************************************************\
  * Basic I2C routines