diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 78200f2d8081..d35493110da3 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,4 +1,7 @@
-/* 6.4.1.12 20190128
+/* 6.4.1.13 20190130
+ * Add command SetOption36 to control boot loop default restoration (#4645, #5063)
+ *
+ * 6.4.1.12 20190128
  * Change code use of boolean to bool and byte to uint8_t
  * Change code uint8_t flags to bool flags
  *
diff --git a/sonoff/my_user_config.h b/sonoff/my_user_config.h
index 83bbb7b6514b..c9c6505d5d03 100644
--- a/sonoff/my_user_config.h
+++ b/sonoff/my_user_config.h
@@ -54,6 +54,7 @@
 
 #define SAVE_DATA              1                 // [SaveData] Save changed parameters to Flash (0 = disable, 1 - 3600 seconds)
 #define SAVE_STATE             1                 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable)
+#define BOOT_LOOP_OFFSET       1                 // [SetOption36] Number of boot loops before starting restoring defaults (0 = disable, 1..200 = boot loops offset)
 
 // -- Wifi ----------------------------------------
 #define WIFI_IP_ADDRESS        "0.0.0.0"         // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address
diff --git a/sonoff/settings.ino b/sonoff/settings.ino
index c1b84cafa595..8f510785862e 100644
--- a/sonoff/settings.ino
+++ b/sonoff/settings.ino
@@ -1027,6 +1027,9 @@ void SettingsDelta(void)
       Settings.interlock[0] = 0xFF;         // Legacy support using all relays in one interlock group
       for (uint8_t i = 1; i < MAX_INTERLOCKS; i++) { Settings.interlock[i] = 0; }
     }
+    if (Settings.version < 0x0604010D) {
+      Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+    }
 
     Settings.version = VERSION;
     SettingsSave(1);
diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h
index 699d8c8196ed..9ba91f09185c 100644
--- a/sonoff/sonoff.h
+++ b/sonoff/sonoff.h
@@ -227,7 +227,7 @@ enum ButtonStates { PRESSED, NOT_PRESSED };
 
 enum Shortcuts { SC_CLEAR, SC_DEFAULT, SC_USER };
 
-enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MDNS_DELAYED_START, P_MAX_PARAM8};  // Max is PARAM8_SIZE (18) - SetOption32 until SetOption49
+enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MDNS_DELAYED_START, P_BOOT_LOOP_OFFSET, P_MAX_PARAM8};  // Max is PARAM8_SIZE (18) - SetOption32 until SetOption49
 
 enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS};
 
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 936f7930e78a..88e0ee3ce897 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -2484,30 +2484,32 @@ void setup(void)
   Settings.flag2.emulation = 0;
 #endif  // USE_EMULATION
 
-  // Disable functionality as possible cause of fast restart within BOOT_LOOP_TIME seconds (Exception, WDT or restarts)
-  if (RtcReboot.fast_reboot_count > 1) {          // Restart twice
-    Settings.flag3.user_esp8285_enable = 0;       // Disable ESP8285 Generic GPIOs interfering with flash SPI
-    if (RtcReboot.fast_reboot_count > 2) {        // Restart 3 times
-      for (uint8_t i = 0; i < MAX_RULE_SETS; i++) {
-        if (bitRead(Settings.rule_stop, i)) {
-          bitWrite(Settings.rule_enabled, i, 0);  // Disable rules causing boot loop
+  if (Settings.param[P_BOOT_LOOP_OFFSET]) {
+    // Disable functionality as possible cause of fast restart within BOOT_LOOP_TIME seconds (Exception, WDT or restarts)
+    if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET]) {       // Restart twice
+      Settings.flag3.user_esp8285_enable = 0;       // Disable ESP8285 Generic GPIOs interfering with flash SPI
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +1) {  // Restart 3 times
+        for (uint8_t i = 0; i < MAX_RULE_SETS; i++) {
+          if (bitRead(Settings.rule_stop, i)) {
+            bitWrite(Settings.rule_enabled, i, 0);  // Disable rules causing boot loop
+          }
         }
       }
-    }
-    if (RtcReboot.fast_reboot_count > 3) {        // Restarted 4 times
-      Settings.rule_enabled = 0;                  // Disable all rules
-    }
-    if (RtcReboot.fast_reboot_count > 4) {        // Restarted 5 times
-      for (uint8_t i = 0; i < sizeof(Settings.my_gp); i++) {
-        Settings.my_gp.io[i] = GPIO_NONE;         // Reset user defined GPIO disabling sensors
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +2) {  // Restarted 4 times
+        Settings.rule_enabled = 0;                  // Disable all rules
       }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +3) {  // Restarted 5 times
+        for (uint8_t i = 0; i < sizeof(Settings.my_gp); i++) {
+          Settings.my_gp.io[i] = GPIO_NONE;         // Reset user defined GPIO disabling sensors
+        }
+      }
+      if (RtcReboot.fast_reboot_count > Settings.param[P_BOOT_LOOP_OFFSET] +4) {  // Restarted 6 times
+        Settings.module = SONOFF_BASIC;             // Reset module to Sonoff Basic
+  //      Settings.last_module = SONOFF_BASIC;
+      }
+      snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
+      AddLog(LOG_LEVEL_DEBUG);
     }
-    if (RtcReboot.fast_reboot_count > 5) {        // Restarted 6 times
-      Settings.module = SONOFF_BASIC;             // Reset module to Sonoff Basic
-//      Settings.last_module = SONOFF_BASIC;
-    }
-    snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_LOG_SOME_SETTINGS_RESET " (%d)"), RtcReboot.fast_reboot_count);
-    AddLog(LOG_LEVEL_DEBUG);
   }
 
   Format(mqtt_client, Settings.mqtt_client, sizeof(mqtt_client));
diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
index 83db36b91eab..099c8955ff13 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            0x0604010C
+#define VERSION            0x0604010D
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"