diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 7f000fe58..2034bd354 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";
@@ -619,6 +619,7 @@ void Mqtt::ha_status() {
     doc["pl_off"]   = "offline";
     doc["stat_cla"] = "measurement";
     doc["dev_cla"]  = "connectivity";
+    doc["ent_cat"]  = "diagnostic";
 
     // doc["avty_t"]      = "~/status"; // commented out, as it causes errors in HA sometimes
     // doc["json_attr_t"] = "~/heartbeat"; // store also as HA attributes
@@ -628,7 +629,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"] = "http://" + ETH.localIP().toString();
+    else
+        dev["cu"] = "http://" + WiFi.localIP().toString();
+    JsonArray ids = dev.createNestedArray("ids");
     ids.add("ems-esp");
 
     char topic[MQTT_TOPIC_MAX_SIZE];
@@ -1066,7 +1071,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 +1089,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 +1192,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:
@@ -1271,6 +1276,11 @@ void Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
         }
     }
 
+    // add category "diagnostic" for system entities
+    if (device_type == EMSdevice::DeviceType::SYSTEM) {
+        doc["ent_cat"] = "diagnostic";
+    }
+
     // add the dev json object to the end
     doc["dev"] = dev_json;
 
diff --git a/src/system.cpp b/src/system.cpp
index 21a904d49..36a816126 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -595,10 +595,7 @@ bool System::heartbeat_json(JsonObject & output) {
     output["uptime"]     = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
     output["uptime_sec"] = uuid::get_uptime_sec();
     bool value_b         = ntp_connected();
-    if (Mqtt::ha_enabled()) {
-        char s[12];
-        output["ntp_status"] = Helpers::render_boolean(s, value_b); // for HA always render as string
-    } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
+    if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
         output["ntp_status"] = value_b;
     } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
         output["ntp_status"] = value_b ? 1 : 0;