diff --git a/webapp/src/components/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue
index 0f0ec106..11aa25a9 100644
--- a/webapp/src/components/FirmwareInfo.vue
+++ b/webapp/src/components/FirmwareInfo.vue
@@ -28,20 +28,20 @@
                     </tr>
                     <tr>
                         <th>{{ $t('firmwareinfo.FirmwareUpdate') }}</th>
-                        <td v-if="modelAllowVersionInfo">
-                            <a v-if="systemStatus.update_url !== undefined" :href="systemStatus.update_url" target="_blank" v-tooltip
-                                :title="$t('firmwareinfo.FirmwareUpdateHint')">
-                                <span class="badge" :class="systemStatus.update_status">
-                                    {{ systemStatus.update_text }}
-                                </span>
-                            </a>
-                            <span v-else class="badge" :class="systemStatus.update_status">
-                                    {{ systemStatus.update_text }}
-                            </span>
-                        </td>
-                        <td v-else>
-                            <div class="form-check form-switch">
+                        <td>
+                            <div class="form-check form-check-inline form-switch">
                                 <input v-model="modelAllowVersionInfo" class="form-check-input" type="checkbox" role="switch" v-tooltip :title="$t('firmwareinfo.FrmwareUpdateAllow')" />
+                                <label class="form-check-label">
+                                    <a v-if="modelAllowVersionInfo && systemStatus.update_url !== undefined" :href="systemStatus.update_url" target="_blank" v-tooltip
+                                        :title="$t('firmwareinfo.FirmwareUpdateHint')">
+                                        <span class="badge" :class="systemStatus.update_status">
+                                            {{ systemStatus.update_text }}
+                                        </span>
+                                    </a>
+                                    <span v-else-if="modelAllowVersionInfo" class="badge" :class="systemStatus.update_status">
+                                            {{ systemStatus.update_text }}
+                                    </span>
+                                </label>
                             </div>
                         </td>
                     </tr>
diff --git a/webapp/src/views/SystemInfoView.vue b/webapp/src/views/SystemInfoView.vue
index 58d03631..3e667d16 100644
--- a/webapp/src/views/SystemInfoView.vue
+++ b/webapp/src/views/SystemInfoView.vue
@@ -96,8 +96,8 @@ export default defineComponent({
     },
     watch: {
         allowVersionInfo(allow: Boolean) {
+            localStorage.setItem("allowVersionInfo", allow ? "1" : "0");
             if (allow) {
-                localStorage.setItem("allowVersionInfo", this.allowVersionInfo ? "1" : "0");
                 this.getUpdateInfo();
             }
         }