diff --git a/src_assets/common/assets/web/Checkbox.vue b/src_assets/common/assets/web/Checkbox.vue
index 1a911cce062..b3332e5635f 100644
--- a/src_assets/common/assets/web/Checkbox.vue
+++ b/src_assets/common/assets/web/Checkbox.vue
@@ -22,13 +22,9 @@ const props = defineProps({
     type: String,
     default: "missing-prefix"
   },
-  checkedByDef: {
-    type: Boolean,
-    default: false
-  },
-  uncheckedByDef: {
-    type: Boolean,
-    default: false
+  default: {
+    type: [Boolean, null],
+    default: null
   }
 });
 
@@ -81,9 +77,8 @@ const checkboxValues = (() => {
 const labelField = props.label ?? `${props.localePrefix}.${props.id}`;
 const descField = props.desc ?? `${props.localePrefix}.${props.id}_desc`;
 const showDesc = props.desc !== "" || Object.entries(slots).length > 0;
-const showDefValue = props.checkedByDef || props.uncheckedByDef;
-const defValue = props.checkedByDef === props.uncheckedByDef ? "INVALID" :
-  props.checkedByDef ? "_common.enabled_def_cbox" : "_common.disabled_def_cbox";
+const showDefValue = props.default !== null;
+const defValue = props.default ? "_common.enabled_def_cbox" : "_common.disabled_def_cbox";
 </script>
 
 <template>
diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index 5a97556dc29..b4669989aca 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -121,7 +121,7 @@ <h1>{{ $t('apps.applications_title') }}</h1>
                   label="apps.global_prep_name"
                   desc="apps.global_prep_desc"
                   v-model="editForm['exclude-global-prep-cmd']"
-                  checked-by-def
+                  default="true"
         ></Checkbox>
         <div class="mb-3">
           <label for="appName" class="form-label">{{ $t('apps.cmd_prep_name') }}</label>
@@ -212,7 +212,7 @@ <h1>{{ $t('apps.applications_title') }}</h1>
                   label="_common.run_as"
                   desc="apps.run_as_desc"
                   v-model="editForm.elevated"
-                  unchecked-by-def
+                  default="false"
         ></Checkbox>
         <!-- auto-detach -->
         <Checkbox class="mb-3"
@@ -220,7 +220,7 @@ <h1>{{ $t('apps.applications_title') }}</h1>
                   label="apps.auto_detach"
                   desc="apps.auto_detach_desc"
                   v-model="editForm['auto-detach']"
-                  checked-by-def
+                  default="true"
         ></Checkbox>
         <!-- wait for all processes -->
         <Checkbox class="mb-3"
@@ -228,7 +228,7 @@ <h1>{{ $t('apps.applications_title') }}</h1>
                   label="apps.wait_all"
                   desc="apps.wait_all_desc"
                   v-model="editForm['wait-all']"
-                  checked-by-def
+                  default="true"
         ></Checkbox>
         <!-- exit timeout -->
         <div class="mb-3">
diff --git a/src_assets/common/assets/web/configs/tabs/AudioVideo.vue b/src_assets/common/assets/web/configs/tabs/AudioVideo.vue
index 450b68afeb9..430fe1fac9f 100644
--- a/src_assets/common/assets/web/configs/tabs/AudioVideo.vue
+++ b/src_assets/common/assets/web/configs/tabs/AudioVideo.vue
@@ -59,7 +59,7 @@ const config = ref(props.config)
                   id="install_steam_audio_drivers"
                   locale-prefix="config"
                   v-model="config.install_steam_audio_drivers"
-                  checked-by-def
+                  default="true"
         ></Checkbox>
       </template>
     </PlatformLayout>
diff --git a/src_assets/common/assets/web/configs/tabs/General.vue b/src_assets/common/assets/web/configs/tabs/General.vue
index 90b4c3a7c9a..d08bec5540c 100644
--- a/src_assets/common/assets/web/configs/tabs/General.vue
+++ b/src_assets/common/assets/web/configs/tabs/General.vue
@@ -129,7 +129,7 @@ function removeCmd(index) {
               id="notify_pre_releases"
               locale-prefix="config"
               v-model="config.notify_pre_releases"
-              unchecked-by-def
+              default="false"
     ></Checkbox>
   </div>
 </template>
diff --git a/src_assets/common/assets/web/configs/tabs/Inputs.vue b/src_assets/common/assets/web/configs/tabs/Inputs.vue
index 2992f149ccf..2e7a081f85a 100644
--- a/src_assets/common/assets/web/configs/tabs/Inputs.vue
+++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue
@@ -18,7 +18,7 @@ const config = ref(props.config)
               id="controller"
               locale-prefix="config"
               v-model="config.controller"
-              checked-by-def
+              default="true"
     ></Checkbox>
 
     <!-- Emulated Gamepad Type -->
@@ -64,14 +64,14 @@ const config = ref(props.config)
                             id="motion_as_ds4"
                             locale-prefix="config"
                             v-model="config.motion_as_ds4"
-                            checked-by-def
+                            default="true"
                   ></Checkbox>
                   <!-- DS4 touchpad -->
                   <Checkbox class="mb-3"
                             id="touchpad_as_ds4"
                             locale-prefix="config"
                             v-model="config.touchpad_as_ds4"
-                            checked-by-def
+                            default="true"
                   ></Checkbox>
                 </template>
                 <!-- DS4 options (all platforms) -->
@@ -81,7 +81,7 @@ const config = ref(props.config)
                             id="ds4_back_as_touchpad_click"
                             locale-prefix="config"
                             v-model="config.ds4_back_as_touchpad_click"
-                            checked-by-def
+                            default="true"
                   ></Checkbox>
                 </template>
               </div>
@@ -105,7 +105,7 @@ const config = ref(props.config)
               id="keyboard"
               locale-prefix="config"
               v-model="config.keyboard"
-              checked-by-def
+              default="true"
     ></Checkbox>
 
     <!-- Key Repeat Delay-->
@@ -130,7 +130,7 @@ const config = ref(props.config)
               id="always_send_scancodes"
               locale-prefix="config"
               v-model="config.always_send_scancodes"
-              checked-by-def
+              default="true"
     ></Checkbox>
 
     <!-- Mapping Key AltRight to Key Windows -->
@@ -139,7 +139,7 @@ const config = ref(props.config)
               id="key_rightalt_to_key_win"
               locale-prefix="config"
               v-model="config.key_rightalt_to_key_win"
-              unchecked-by-def
+              default="false"
     ></Checkbox>
 
     <!-- Enable Mouse Input -->
@@ -148,7 +148,7 @@ const config = ref(props.config)
               id="mouse"
               locale-prefix="config"
               v-model="config.mouse"
-              checked-by-def
+              default="true"
     ></Checkbox>
 
     <!-- High resolution scrolling support -->
@@ -157,7 +157,7 @@ const config = ref(props.config)
               id="high_resolution_scrolling"
               locale-prefix="config"
               v-model="config.high_resolution_scrolling"
-              checked-by-def
+              default="true"
     ></Checkbox>
 
     <!-- Native pen/touch support -->
@@ -166,7 +166,7 @@ const config = ref(props.config)
               id="native_pen_touch"
               locale-prefix="config"
               v-model="config.native_pen_touch"
-              checked-by-def
+              default="true"
     ></Checkbox>
   </div>
 </template>
diff --git a/src_assets/common/assets/web/configs/tabs/Network.vue b/src_assets/common/assets/web/configs/tabs/Network.vue
index 2165615eff1..4fac049dbbd 100644
--- a/src_assets/common/assets/web/configs/tabs/Network.vue
+++ b/src_assets/common/assets/web/configs/tabs/Network.vue
@@ -20,7 +20,7 @@ const effectivePort = computed(() => +config.value?.port ?? defaultMoonlightPort
               id="upnp"
               locale-prefix="config"
               v-model="config.upnp"
-              unchecked-by-def
+              default="false"
     ></Checkbox>
 
     <!-- Address family -->
diff --git a/src_assets/common/assets/web/configs/tabs/encoders/AmdAmfEncoder.vue b/src_assets/common/assets/web/configs/tabs/encoders/AmdAmfEncoder.vue
index 10a6ee8da43..1da4999942c 100644
--- a/src_assets/common/assets/web/configs/tabs/encoders/AmdAmfEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/AmdAmfEncoder.vue
@@ -54,7 +54,7 @@ const config = ref(props.config)
                       id="amd_enforce_hrd"
                       locale-prefix="config"
                       v-model="config.amd_enforce_hrd"
-                      unchecked-by-def
+                      default="false"
             ></Checkbox>
           </div>
         </div>
@@ -89,7 +89,7 @@ const config = ref(props.config)
                       id="amd_preanalysis"
                       locale-prefix="config"
                       v-model="config.amd_preanalysis"
-                      unchecked-by-def
+                      default="false"
             ></Checkbox>
 
             <!-- AMD VBAQ -->
@@ -97,7 +97,7 @@ const config = ref(props.config)
                       id="amd_vbaq"
                       locale-prefix="config"
                       v-model="config.amd_vbaq"
-                      checked-by-def
+                      default="true"
             ></Checkbox>
 
             <!-- AMF Coder (H264) -->
diff --git a/src_assets/common/assets/web/configs/tabs/encoders/IntelQuickSyncEncoder.vue b/src_assets/common/assets/web/configs/tabs/encoders/IntelQuickSyncEncoder.vue
index 0a41768eab2..1a13beba054 100644
--- a/src_assets/common/assets/web/configs/tabs/encoders/IntelQuickSyncEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/IntelQuickSyncEncoder.vue
@@ -41,7 +41,7 @@ const config = ref(props.config)
               id="qsv_slow_hevc"
               locale-prefix="config"
               v-model="config.qsv_slow_hevc"
-              unchecked-by-def
+              default="false"
     ></Checkbox>
   </div>
 </template>
diff --git a/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue b/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue
index 4a1311fe7ad..15ae8dc6789 100644
--- a/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue
@@ -78,7 +78,7 @@ const config = ref(props.config)
                       id="nvenc_realtime_hags"
                       locale-prefix="config"
                       v-model="config.nvenc_realtime_hags"
-                      checked-by-def
+                      default="true"
             >
               <br>
               <br>
@@ -91,7 +91,7 @@ const config = ref(props.config)
                       id="nvenc_latency_over_power"
                       locale-prefix="config"
                       v-model="config.nvenc_latency_over_power"
-                      checked-by-def
+                      default="true"
             ></Checkbox>
 
             <!-- Present OpenGL/Vulkan on top of DXGI -->
@@ -100,7 +100,7 @@ const config = ref(props.config)
                       id="nvenc_opengl_vulkan_on_dxgi"
                       locale-prefix="config"
                       v-model="config.nvenc_opengl_vulkan_on_dxgi"
-                      checked-by-def
+                      default="true"
             ></Checkbox>
 
             <!-- NVENC H264 CAVLC -->
@@ -108,7 +108,7 @@ const config = ref(props.config)
                       id="nvenc_h264_cavlc"
                       locale-prefix="config"
                       v-model="config.nvenc_h264_cavlc"
-                      unchecked-by-def
+                      default="false"
             ></Checkbox>
           </div>
         </div>
diff --git a/src_assets/common/assets/web/configs/tabs/encoders/VAAPIEncoder.vue b/src_assets/common/assets/web/configs/tabs/encoders/VAAPIEncoder.vue
index 9972ae55760..063bba45b50 100644
--- a/src_assets/common/assets/web/configs/tabs/encoders/VAAPIEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/VAAPIEncoder.vue
@@ -17,7 +17,7 @@ const config = ref(props.config)
               id="vaapi_strict_rc_buffer"
               locale-prefix="config"
               v-model="config.vaapi_strict_rc_buffer"
-              unchecked-by-def
+              default="false"
     ></Checkbox>
   </div>
 </template>
diff --git a/src_assets/common/assets/web/configs/tabs/encoders/VideotoolboxEncoder.vue b/src_assets/common/assets/web/configs/tabs/encoders/VideotoolboxEncoder.vue
index 5f4b6356ad0..084e5f1def0 100644
--- a/src_assets/common/assets/web/configs/tabs/encoders/VideotoolboxEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/VideotoolboxEncoder.vue
@@ -35,7 +35,7 @@ const config = ref(props.config)
               desc=""
               locale-prefix="config"
               v-model="config.vt_realtime"
-              checked-by-def
+              default="true"
     ></Checkbox>
   </div>
 </template>