diff --git a/data/igate_conf.json b/data/igate_conf.json
index 400be7d..f072635 100644
--- a/data/igate_conf.json
+++ b/data/igate_conf.json
@@ -93,7 +93,7 @@
     }, 
     "mqtt": {
         "active": false,
-        "host": "",
+        "server": "",
         "login": "",
         "password": "",
         "port": 1883
diff --git a/data_embed/index.html b/data_embed/index.html
index d9161e2..c382896 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -1548,60 +1548,77 @@
                                         </div>
                                     </div>
                                     <div class="col-12">
-                                        <label for="mqtt.server" class="form-label"
-                                        >Server</label
+                                        <label
+                                            for="mqtt.server"
+                                            class="form-label"
+                                            >Server</label
                                         >
-                                        <input
+                                        <div class="input-group">
+                                            <input
                                                 type="text"
                                                 name="mqtt.server"
                                                 id="mqtt.server"
                                                 class="form-control"
-                                        />
+                                            />
+                                        </div>
                                     </div>
                                     <div class="col-12">
-                                        <label for="mqtt.topic" class="form-label"
-                                        >Topic</label
+                                        <label
+                                            for="mqtt.topic"
+                                            class="form-label"
+                                            >Topic</label
                                         >
-                                        <input
+                                        <div class="input-group">
+                                            <input
                                                 type="text"
                                                 name="mqtt.topic"
                                                 id="mqtt.topic"
                                                 class="form-control"
                                                 placeholder="aprs-igate"
-                                        />
+                                            />
+                                        </div>
                                         <div class="form-text">
                                             Default is <strong>aprs-igate</strong>
                                         </div>
                                     </div>
                                     <div class="col-12">
-                                        <label for="mqtt.username" class="form-label"
-                                        >Username</label
+                                        <label
+                                            for="mqtt.username"
+                                            class="form-label"
+                                            >Username</label
                                         >
-                                        <input
+                                        <div class="input-group">
+                                            <input
                                                 type="text"
                                                 name="mqtt.username"
                                                 id="mqtt.username"
                                                 class="form-control"
-                                        />
+                                            />
+                                        </div>
                                     </div>
                                     <div class="col-12 mt-3">
-                                        <label for="mqtt.password" class="form-label"
-                                        >Password</label
+                                        <label
+                                            for="mqtt.password"
+                                            class="form-label"
+                                            >Password</label
                                         >
-                                        <input
+                                        <div class="input-group">
+                                            <input
                                                 type="password"
                                                 name="mqtt.password"
                                                 id="mqtt.password"
                                                 class="form-control"
-                                        />
+                                            />
+                                        </div>
                                     </div>
                                     <div class="col-12 mt-3">
                                         <label
-                                                for="mqtt.port"
-                                                class="form-label"
-                                        >Port</label
+                                            for="mqtt.port"
+                                            class="form-label"
+                                            >Port</label
                                         >
-                                        <input
+                                        <div class="input-group">
+                                            <input
                                                 type="number"
                                                 name="mqtt.port"
                                                 id="mqtt.port"
@@ -1610,7 +1627,8 @@
                                                 required=""
                                                 step="1"
                                                 min="0"
-                                        />
+                                            />
+                                        </div>
                                         <div class="form-text">
                                             Default is <strong>1883</strong>
                                         </div>
diff --git a/src/web_utils.cpp b/src/web_utils.cpp
index 5b9902a..c3ddce5 100644
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -238,9 +238,9 @@ namespace WEB_Utils {
         Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();
 
         Config.remoteManagement.managers    = request->getParam("remoteManagement.managers", true)->value();
-        Config.remoteManagement.rfOnly      = request->getParam("remoteManagement.rfOnly", true);
+        Config.remoteManagement.rfOnly      = request->hasParam("remoteManagement.rfOnly", true);
 
-        Config.mqtt.active                  = request->getParam("mqtt.active", true);
+        Config.mqtt.active                  = request->hasParam("mqtt.active", true);
         Config.mqtt.server                  = request->getParam("mqtt.server", true)->value();
         Config.mqtt.topic                   = request->getParam("mqtt.topic", true)->value();
         Config.mqtt.username                = request->getParam("mqtt.username", true)->value();