diff --git a/CHANGELOG.md b/CHANGELOG.md
index 171ff69dc..5533c4e65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Retrieve/Set thermostat mode for Junkers FW100/120 thermostats (thanks @Neonox31)
 - Added sending of all Mixer Module data via MQTT (thanks @peclik)
 - Improved handling of MQTT publish and subscribe errors
-- Added MQTT QOS (`mqtt_qos`, default 1), Keep Alive (`mqtt_keepalive`, default 60 seconds) and Retain (`mqtt_retain`, default on) as parameters to both telnet and WebUI
+- Added MQTT QOS (`mqtt_qos`, default 0), Keep Alive (`mqtt_keepalive`, default 60 seconds) and Retain (`mqtt_retain`, default off) as parameters to both telnet and WebUI
 
 ### Fixed
 
diff --git a/src/MyESP.h b/src/MyESP.h
index 4c50ddf7e..a14427d76 100644
--- a/src/MyESP.h
+++ b/src/MyESP.h
@@ -79,13 +79,13 @@ extern struct rst_info resetInfo;
 #define MQTT_WILL_ONLINE_PAYLOAD "online"   // for last will & testament payload
 #define MQTT_WILL_OFFLINE_PAYLOAD "offline" // for last will & testament payload
 #define MQTT_BASE_DEFAULT "home"            // default MQTT prefix to topics
-#define MQTT_RETAIN true
-#define MQTT_KEEPALIVE 60                // default keepalive 1 minute
-#define MQTT_QOS 0                       // default qos 0
-#define MQTT_WILL_TOPIC "status"         // for last will & testament topic name
-#define MQTT_MAX_TOPIC_SIZE 50           // max length of MQTT topic
-#define MQTT_MAX_PAYLOAD_SIZE 700        // max size of a JSON object. See https://arduinojson.org/v6/assistant/
-#define MQTT_MAX_PAYLOAD_SIZE_LARGE 2000 // max size of a large JSON object, like for sending MQTT log
+#define MQTT_RETAIN false                   // default false
+#define MQTT_KEEPALIVE 60                   // default keepalive 1 minute
+#define MQTT_QOS 0                          // default qos 0
+#define MQTT_WILL_TOPIC "status"            // for last will & testament topic name
+#define MQTT_MAX_TOPIC_SIZE 50              // max length of MQTT topic
+#define MQTT_MAX_PAYLOAD_SIZE 700           // max size of a JSON object. See https://arduinojson.org/v6/assistant/
+#define MQTT_MAX_PAYLOAD_SIZE_LARGE 2000    // max size of a large JSON object, like for sending MQTT log
 
 // Internal MQTT events
 #define MQTT_CONNECT_EVENT 0
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index c534f4167..88680f64a 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -209,7 +209,7 @@
     <div class="row form-group">
         <label class="col-xs-3">QOS<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="MQTT QOS"></i></label>
+                data-content="MQTT QOS 0,1 or 2"></i></label>
         <span class="col-xs-9">
             <input class="form-control input-sm" placeholder="1" value="" style="display:inline;max-width:185px"
                 id="mqttqos" type="text">