diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 7f000fe58..f955b5af2 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -610,8 +610,8 @@ void Mqtt::ha_status() {
         strcpy(uniq, "system_status");
     }
 
-    doc["uniq_id"]  = uniq;
-    doc["obj_id"]   = uniq;
+    doc["uniq_id"] = uniq;
+    doc["obj_id"]  = uniq;
 
     doc["stat_t"]   = mqtt_base_ + "/status";
     doc["name"]     = "EMS-ESP status";
@@ -628,7 +628,11 @@ void Mqtt::ha_status() {
     dev["sw"]      = "v" + std::string(EMSESP_APP_VERSION);
     dev["mf"]      = "proddy";
     dev["mdl"]     = "EMS-ESP";
-    JsonArray ids  = dev.createNestedArray("ids");
+    if (EMSESP::system_.ethernet_connected())
+        dev["cu"] = ETH.localIP().toString();
+    else
+        dev["cu"] = WiFi.localIP().toString();
+    JsonArray ids = dev.createNestedArray("ids");
     ids.add("ems-esp");
 
     char topic[MQTT_TOPIC_MAX_SIZE];
@@ -1066,7 +1070,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
     doc["obj_id"]  = uniq_id; // same as unique_id
 
     const char * ic_ha  = "ic";           // icon - only set this if there is no device class
-    const char * sc_ha  = "state_class";  // state class
+    const char * sc_ha  = "stat_cla";     // state class
     const char * uom_ha = "unit_of_meas"; // unit of measure
 
     // handle commands, which are device entities that are writable
@@ -1084,7 +1088,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
 
         // for enums, add options
         if (type == DeviceValueType::ENUM) {
-            JsonArray option_list = doc.createNestedArray("options");
+            JsonArray option_list = doc.createNestedArray("ops"); //options
             for (uint8_t i = 0; i < options_size; i++) {
                 option_list.add(Helpers::translated_word(options[i]));
             }
@@ -1187,7 +1191,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
     // this next section is adding the state class, device class and sometimes the icon
     // used for Sensor and Binary Sensor Entities in HA
     if (set_ha_classes) {
-        const char * dc_ha = "device_class"; // device class
+        const char * dc_ha = "dev_cla"; // device class
 
         switch (uom) {
         case DeviceValueUOM::DEGREES: