diff --git a/include/Configuration.h b/include/Configuration.h
index da90d22..4f4805d 100644
--- a/include/Configuration.h
+++ b/include/Configuration.h
@@ -70,6 +70,7 @@ struct CONFIG_T {
     uint8_t Ntp_SunsetType;
 
     bool Mqtt_Enabled;
+    char Mqtt_Hostname[MQTT_MAX_HOSTNAME_STRLEN + 1];
     uint Mqtt_Port;
     char Mqtt_Username[MQTT_MAX_USERNAME_STRLEN + 1];
     char Mqtt_Password[MQTT_MAX_PASSWORD_STRLEN + 1];
@@ -80,6 +81,18 @@ struct CONFIG_T {
     char Mqtt_LwtValue_Offline[MQTT_MAX_LWTVALUE_STRLEN + 1];
     uint32_t Mqtt_PublishInterval;
 
+    bool Mqtt_Hass_Enabled;
+    bool Mqtt_Hass_Retain;
+    char Mqtt_Hass_Topic[MQTT_MAX_TOPIC_STRLEN + 1];
+    bool Mqtt_Hass_IndividualPanels;
+    bool Mqtt_Hass_Expire;
+
+    bool Mqtt_Tls;
+    char Mqtt_RootCaCert[MQTT_MAX_CERT_STRLEN + 1];
+    bool Mqtt_TlsCertLogin;
+    char Mqtt_ClientCert[MQTT_MAX_CERT_STRLEN + 1];
+    char Mqtt_ClientKey[MQTT_MAX_CERT_STRLEN + 1];
+
     INVERTER_CONFIG_T Inverter[INV_MAX_COUNT];
 
     uint64_t Dtu_Serial;
@@ -88,20 +101,6 @@ struct CONFIG_T {
     int8_t Dtu_CmtPaLevel;
     uint32_t Dtu_CmtFrequency;
 
-    bool Mqtt_Hass_Enabled;
-    bool Mqtt_Hass_Retain;
-    char Mqtt_Hass_Topic[MQTT_MAX_TOPIC_STRLEN + 1];
-    bool Mqtt_Hass_IndividualPanels;
-    bool Mqtt_Tls;
-    char Mqtt_RootCaCert[MQTT_MAX_CERT_STRLEN + 1];
-    bool Mqtt_TlsCertLogin;
-    char Mqtt_ClientCert[MQTT_MAX_CERT_STRLEN + 1];
-    char Mqtt_ClientKey[MQTT_MAX_CERT_STRLEN + 1];
-
-    char Mqtt_Hostname[MQTT_MAX_HOSTNAME_STRLEN + 1];
-
-    bool Mqtt_Hass_Expire;
-
     char Security_Password[WIFI_MAX_PASSWORD_STRLEN + 1];
     bool Security_AllowReadonly;