diff --git a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
index b6b62d80..e0df96fc 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
@@ -114,15 +114,7 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
         }
         if ((toUpper(_param) == "VALIDATESERVERCERT") && (splitted.size() > 1))
         {
-            bool _validateServerCert = alphanumericToBoolean(splitted[1]);
-            if (_validateServerCert == true)
-            {
-                validateServerCert = false;
-            }
-            else
-            {
-                validateServerCert = true;
-            }
+            validateServerCert = alphanumericToBoolean(splitted[1]);
         }  
         if ((toUpper(_param) == "CLIENTCERT") && (splitted.size() > 1))
         {
diff --git a/code/components/jomjol_mqtt/interface_mqtt.cpp b/code/components/jomjol_mqtt/interface_mqtt.cpp
index 2681a4bb..17fc4cb7 100644
--- a/code/components/jomjol_mqtt/interface_mqtt.cpp
+++ b/code/components/jomjol_mqtt/interface_mqtt.cpp
@@ -303,7 +303,7 @@ int MQTT_Init() {
     if (caCert.length()){
         mqtt_cfg.broker.verification.certificate = caCert.c_str();
         mqtt_cfg.broker.verification.certificate_len = caCert.length() + 1;
-        mqtt_cfg.broker.verification.skip_cert_common_name_check = validateServerCert;
+        mqtt_cfg.broker.verification.skip_cert_common_name_check = !validateServerCert;
     }
 
     if (clientCert.length() && clientKey.length()){
diff --git a/sd-card/html/edit_config_template.html b/sd-card/html/edit_config_template.html
index dea45e68..92a85f1e 100644
--- a/sd-card/html/edit_config_template.html
+++ b/sd-card/html/edit_config_template.html
@@ -1122,7 +1122,8 @@
 		
 		<tr class="MQTTItem expert" unused_id="exMqtt">
 			<td class="indent1">
-				<label><class id="MQTT_ValidateServerCert_text" style="color:black;">Validate ServerCert</class></label>
+				<input type="checkbox" id="MQTT_ValidateServerCert_enabled" value="1"  onclick = 'InvertEnableItem("MQTT", "ValidateServerCert")' unchecked >
+				<label for=MQTT_ValidateServerCert_enabled><class id="MQTT_ValidateServerCert_text" style="color:black;">Validate ServerCert</class></label>
 			</td>
 			<td>
 				<select id="MQTT_ValidateServerCert_value1">