diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 476abbfe0..d0f2f92a7 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1801,6 +1801,10 @@ void WebCallback(JsonObject root) {
             thermostat["tmode"] = "manual";
         } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
             thermostat["tmode"] = "auto";
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
+            thermostat["tmode"] = "day";
+        } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
+            thermostat["tmode"] = "night";
         }
     } else {
         thermostat["ok"] = false;
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 6f5dcd8f6..eb343fe2a 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -209,6 +209,7 @@ static const _EMS_Device EMS_Devices[] = {
     {208, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax plus/GB192/Bosch Condens GC9000", EMS_DEVICE_FLAG_NONE},
     {64, EMS_DEVICE_TYPE_BOILER, "Sieger BK13,BK15/Nefit Smartline/Buderus GB1x2", EMS_DEVICE_FLAG_NONE},
     {234, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax Plus GB122", EMS_DEVICE_FLAG_NONE},
+    {84, EMS_DEVICE_TYPE_BOILER, "Buderus Logamax Plus GB022", EMS_DEVICE_FLAG_NONE},
     {95, EMS_DEVICE_TYPE_BOILER, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Cerapur Top/Worcester Greenstar i/Generic HT3", EMS_DEVICE_FLAG_NONE},
     {122, EMS_DEVICE_TYPE_BOILER, "Nefit Proline", EMS_DEVICE_FLAG_NONE},
     {170, EMS_DEVICE_TYPE_BOILER, "Buderus Logano GB212", EMS_DEVICE_FLAG_NONE},
diff --git a/src/version.h b/src/version.h
index 6733def75..e3be0139b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.5b19"
+#define APP_VERSION "1.9.5b20"