diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino
index c45d65d96..986f4c173 100644
--- a/sonoff/xdrv_01_webserver.ino
+++ b/sonoff/xdrv_01_webserver.ino
@@ -382,7 +382,7 @@ const char HTTP_FORM_OTHER[] PROGMEM =
"
" D_ACTIVATE "
"
""
"
"
- "" D_WEB_ADMIN_PASSWORD "
"
+ "" D_WEB_ADMIN_PASSWORD "
"
"
"
"" D_MQTT_ENABLE "
"
"
";
@@ -1543,7 +1543,7 @@ void OtherSaveSettings(void)
char webindex[5];
char friendlyname[sizeof(Settings.friendlyname[0])];
- WebGetArg("p1", tmp, sizeof(tmp));
+ WebGetArg("wp", tmp, sizeof(tmp));
strlcpy(Settings.web_password, (!strlen(tmp)) ? "" : (strchr(tmp,'*')) ? Settings.web_password : tmp, sizeof(Settings.web_password));
Settings.flag.mqtt_enabled = WebServer->hasArg("b1");
#ifdef USE_EMULATION