diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 1712c53f..05ee333b 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -61,7 +61,6 @@ void setup() {
 	if(config.hasConfig()) {
 		config.load();
 	}
-#if DEBUG_MODE
 #if HW_ROARFRED
 	if(config.getMeterType() == 3) {
 		Serial.begin(2400, SERIAL_8N1);
@@ -70,15 +69,14 @@ void setup() {
 	}
 #else
 	Serial.begin(115200);
-#endif
 #endif
 
 	if(config.hasConfig()) {
-		Debug.begin(config.getWifiHostname(), (uint8_t) config.getDebugLevel());
 		if(config.getAuthSecurity() > 0) {
 			Debug.setPassword(config.getAuthPassword());
 		}
 		Debug.setSerialEnabled(config.isDebugSerial());
+		Debug.begin(config.getWifiHostname(), (uint8_t) config.getDebugLevel());
 		if(!config.isDebugTelnet()) {
 			Debug.stop();
 		}
@@ -96,7 +94,7 @@ void setup() {
 		debugI("Voltage: %.2fV", vcc);
 	}
 
-	if (vcc > 0 && vcc < 3.1) {
+	if (vcc > 0 && vcc < 3.25) {
 		if(Debug.isActive(RemoteDebug::INFO)) {
 			debugI("Votltage is too low, sleeping");
 			Serial.flush();
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index c4d39e29..b5c6d8c9 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -248,6 +248,9 @@ void AmsWebServer::configMqttHtml() {
 	html.replace("${config.mqttUser}", config->getMqttUser());
 	html.replace("${config.mqttPassword}", config->getMqttPassword());
 	html.replace("${config.mqttPayloadFormat}", String(config->getMqttPayloadFormat()));
+	for(int i = 0; i<2; i++) {
+		html.replace("${config.mqttPayloadFormat" + String(i) + "}", config->getMqttPayloadFormat() == i ? "selected"  : "");
+	}
 
 	server.setContentLength(html.length());
 	server.send(200, "text/html", html);
@@ -496,7 +499,9 @@ void AmsWebServer::handleSave() {
 		if(config->getAuthSecurity() > 0) {
 			config->setAuthUser(server.arg("authUser"));
 			config->setAuthPassword(server.arg("authPassword"));
+			debugger->setPassword(config->getAuthPassword());
 		} else {
+			debugger->setPassword("");
 			config->clearAuth();
 		}
 	}
@@ -505,12 +510,15 @@ void AmsWebServer::handleSave() {
 		config->setDebugTelnet(server.hasArg("debugTelnet") && server.arg("debugTelnet") == "true");
 		config->setDebugSerial(server.hasArg("debugSerial") && server.arg("debugSerial") == "true");
 		config->setDebugLevel(server.arg("debugLevel").toInt());
+
 		debugger->stop();
-		debugger->begin(config->getWifiHostname(), (uint8_t) config->getDebugLevel());
 		if(config->getAuthSecurity() > 0) {
 			debugger->setPassword(config->getAuthPassword());
+		} else {
+			debugger->setPassword("");
 		}
 		debugger->setSerialEnabled(config->isDebugSerial());
+		debugger->begin(config->getWifiHostname(), (uint8_t) config->getDebugLevel());
 		if(!config->isDebugTelnet()) {
 			debugger->stop();
 		}
diff --git a/web/configsystem.html b/web/configsystem.html
index a21603cb..fc27bed1 100644
--- a/web/configsystem.html
+++ b/web/configsystem.html
@@ -41,6 +41,7 @@
     <form method="post" action="/save">
         <input type="hidden" name="sysConfig" value="true"/>
         <div class="my-3 p-3 bg-white rounded shadow">
+            <div class="alert alert-warning">!!WARNING!!<br/>Remote debugging is considered insecure and should not be left enabled when not debugging</div>
             <div class="row">
                 <div class="col-md-3">
                     <label><input type="checkbox" name="debugTelnet" value="true" ${config.debugTelnet}/> Telnet debugger</label>