diff --git a/doc/home_assistant/climate.yaml b/doc/home_assistant/climate.yaml
index b344c66fb..a308f0f03 100644
--- a/doc/home_assistant/climate.yaml
+++ b/doc/home_assistant/climate.yaml
@@ -21,7 +21,7 @@
  - platform: mqtt
    name: boiler
    modes:
-    - "on"
+    - "auto"
     - "off"
    min_temp: 40
    max_temp: 60
@@ -31,6 +31,6 @@
    temperature_command_topic: "home/ems-esp/boiler_cmd_wwtemp"
    current_temperature_template: "{{ value_json.wWCurTmp }}"
    temperature_state_template: "{{ value_json.wWSelTemp }}"
-   mode_state_template: "{{ value_json.wWActivated }}"
+   mode_state_template: "{% if value_json.wWActivated == 'off' %} off {% else %} auto {% endif %}"
    mode_state_topic: "home/ems-esp/boiler_data"
    mode_command_topic: "home/ems-esp/wwactivated"
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index b4c7da1f5..ebdef1a65 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1602,7 +1602,7 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
 
         // wwActivated
         if (strcmp(topic, TOPIC_BOILER_WWACTIVATED) == 0) {
-            if (message[0] == '1' || strcmp(message, "on") == 0) {
+            if ((message[0] == '1' || strcmp(message, "on") == 0) || (strcmp(message, "auto") == 0)) {
                 ems_setWarmWaterActivated(true);
             } else if (message[0] == '0' || strcmp(message, "off") == 0) {
                 ems_setWarmWaterActivated(false);