diff --git a/src/web/html/setup.html b/src/web/html/setup.html
index 33399728..a3a15362 100644
--- a/src/web/html/setup.html
+++ b/src/web/html/setup.html
@@ -245,20 +245,17 @@
                                 <div class="col-12 col-sm-9"><input type="number" name="mqttInterval" title="Invalid input" /></div>
                             </div>
                             <div class="row mb-3">
-                                <div class="col-8 col-sm-3">Send Home Assistant discovery config on MQTT connect</div>
-                                <div class="col-4 col-sm-9"><input type="checkbox" name="sendConfigOnConnect"/></div>
+                                <div class="col-8 col-sm-3">{#RETAIN}</div>
+                                <div class="col-4 col-sm-9"><input type="checkbox" name="retain"/></div>
                             </div>
                             <div class="row mb-3">
-                                <div class="col-12 col-sm-3 my-2">Force sending Home Assistant discovery config</div>
-                                <div class="col-12 col-sm-9">
+                                <div class="col-8 col-sm-3">{#SEND_CONFIG_ON_CONNECT}</div>
+                                <div class="col-4 col-sm-3"><input type="checkbox" name="sendConfigOnConnect"/></div>
+                                <div class="col-10 col-sm-3">
                                     <input type="button" name="mqttDiscovery" id="mqttDiscovery" class="btn" value="{#BTN_SEND}" onclick="sendDiscoveryConfig()"/>
                                     <span id="apiResultMqtt"></span>
                                 </div>
                             </div>
-                            <div class="row mb-3">
-                                <div class="col-8 col-sm-3">{#RETAIN}</div>
-                                <div class="col-4 col-sm-9"><input type="checkbox" name="retain"/></div>
-                            </div>
                         </fieldset>
                     </div>
 
diff --git a/src/web/lang.json b/src/web/lang.json
index 96f60a54..21354f54 100644
--- a/src/web/lang.json
+++ b/src/web/lang.json
@@ -495,8 +495,8 @@
                 },
                 {
                     "token": "BTN_SEND",
-                    "en": "send",
-                    "de": "senden"
+                    "en": "Force send",
+                    "de": "Senden erzwingen"
                 },
                 {
                     "token": "BTN_REBOOT_SUCCESSFUL_SAVE",
@@ -822,6 +822,11 @@
                     "token": "NO_NETWORK_FOUND",
                     "en": "no network found",
                     "de": "kein Netzwerk gefunden"
+                },
+                {
+                    "token": "SEND_CONFIG_ON_CONNECT",
+                    "en": "Send discovery config on MQTT connect",
+                    "de": "Discovery-Konfiguration beim MQTT-Verbindungsaufbau senden"
                 }
             ]
         },