diff --git a/client/bin/src/main.rs b/client/bin/src/main.rs
index 6a5f9f8..4f4c1fc 100644
--- a/client/bin/src/main.rs
+++ b/client/bin/src/main.rs
@@ -482,9 +482,17 @@ fn main_function(parameter1: String, parameter2: Option<String>) -> ExitCode {
             let c = read_ini_file(configOrMqttAddress);
             
             //update configuration
-            gc.mqttIPAddress = c.mqttIPAddress;
-            gc.panelIPAddress = c.panelIPAddress;
-            gc.mqttPrefix = c.mqttPrefix;
+            if ((c.mqttIPAddress.len() > 0) &&
+                (c.mqttPrefix.len() > 0))    
+            {
+                gc.mqttIPAddress = c.mqttIPAddress;
+                gc.mqttPrefix = c.mqttPrefix;
+            }
+
+            if (c.panelIPAddress.len() > 0)
+            {
+                gc.panelIPAddress = c.panelIPAddress;
+            }
             println!("Read INI {:} @ {:}", gc.mqttPrefix, gc.mqttIPAddress);
         }
         else