diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index 769acfd0d..e9d17bb8e 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 1bc7b2ea7..ed3202919 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Vorlage Parameter"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "basiert auf"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "Nutzer pull-up Auswahl"
 
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index 3d96d4744..8e4cf7077 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 7d8f32e6b..794af57fa 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index 1bc0f064c..9dc72cf7c 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 562d85e60..06ada0874 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Paramètres du modèle"
 #define D_TEMPLATE_NAME "Nom"
 #define D_BASE_TYPE "Basé sur"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "Entrée ADC0"
 #define D_ALLOW_PULLUP "Choix de pull-up utilisateur"
 
diff --git a/sonoff/language/he-HE.h b/sonoff/language/he-HE.h
index deca89d18..8437e1a05 100644
--- a/sonoff/language/he-HE.h
+++ b/sonoff/language/he-HE.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index e9eed8025..393d250e7 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index 8269441ae..0f35e92b2 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 00d658d0c..b8b159eff 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 14161f0be..5d2db7afc 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
index 013768607..94d7bea00 100644
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 11f10f750..47dec4ea2 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index b3641c647..038ba6615 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/sk-SK.h b/sonoff/language/sk-SK.h
index 76fa89e7a..ff05b471d 100644
--- a/sonoff/language/sk-SK.h
+++ b/sonoff/language/sk-SK.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/sv-SE.h b/sonoff/language/sv-SE.h
index eca87b7c7..9045b2e24 100644
--- a/sonoff/language/sv-SE.h
+++ b/sonoff/language/sv-SE.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
index bb9aa1a4c..f971c9ba2 100755
--- a/sonoff/language/tr-TR.h
+++ b/sonoff/language/tr-TR.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
index 289e9292c..1557a0d78 100644
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index f37a127de..4e3a7d9fd 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index 5188db09b..f8526aa5b 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -302,7 +302,7 @@
 #define D_TEMPLATE_PARAMETERS "Template parameters"
 #define D_TEMPLATE_NAME "Name"
 #define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Flags"
+#define D_TEMPLATE_FLAGS "Options"
 #define D_ALLOW_ADC0 "ADC0 input"
 #define D_ALLOW_PULLUP "User pull-up selection"
 
diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino
index 4817dde85..3370fda1f 100644
--- a/sonoff/xdrv_01_webserver.ino
+++ b/sonoff/xdrv_01_webserver.ino
@@ -368,7 +368,7 @@ const char HTTP_FORM_OTHER[] PROGMEM =
   "<p></p>"
   "<fieldset><legend><b>&nbsp;" D_TEMPLATE "&nbsp;</b></legend>"
   "<p><input id='t1' name='t1' placeholder='" D_TEMPLATE "' value='{t1'></p>"
-  "<p><input id='t2' name='t2' type='checkbox'><b>" D_ACTIVATE "</b></p>"
+  "<p><input id='t2' name='t2' type='checkbox'{t2><b>" D_ACTIVATE "</b></p>"
   "</fieldset>"
   "<br/>"
   "<b>" D_WEB_ADMIN_PASSWORD "</b><br/><input id='p1' name='p1' type='password' placeholder='" D_WEB_ADMIN_PASSWORD "' value='" D_ASTERIX "'><br/>"
@@ -1352,6 +1352,7 @@ void HandleOtherConfiguration(void)
   page += FPSTR(HTTP_FORM_OTHER);
   TemplateJson();
   page.replace(F("{t1"), mqtt_data);
+  page.replace(F("{t2"), (USER_MODULE == Settings.module) ? F(" checked disabled") : F(""));
   page.replace(F("{r1"), (Settings.flag.mqtt_enabled) ? F(" checked") : F(""));
 
   uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present;