diff --git a/settings/ui/components/settings/SettingMultiChoice.vue b/settings/ui/components/settings/SettingMultiChoice.vue
index 8a1bbd2961..b0968726f3 100644
--- a/settings/ui/components/settings/SettingMultiChoice.vue
+++ b/settings/ui/components/settings/SettingMultiChoice.vue
@@ -21,17 +21,12 @@
           v-for="(option, index) in setting.multiChoiceValue.options"
           :key="getOptionElementId(index)"
         >
-          <label :for="getOptionElementId(index)">
-            <input
-              :id="getOptionElementId(index)"
-              type="checkbox"
-              class="oc-checkbox"
-              :value="option"
-              v-model="selectedOptions"
-              @change="onSelectedOption"
-            />
-            {{ option.displayValue }}
-          </label>
+          <oc-checkbox
+            v-model="selectedOptions"
+            :option="option"
+            @input="onSelectedOption"
+            :label="option.displayValue"
+          />
         </li>
       </ul>
     </oc-drop>
diff --git a/settings/ui/components/settings/SettingSingleChoice.vue b/settings/ui/components/settings/SettingSingleChoice.vue
index d6e71e8478..3ce66b21f5 100644
--- a/settings/ui/components/settings/SettingSingleChoice.vue
+++ b/settings/ui/components/settings/SettingSingleChoice.vue
@@ -22,17 +22,12 @@
           v-for="(option, index) in setting.singleChoiceValue.options"
           :key="getOptionElementId(index)"
         >
-          <label :for="getOptionElementId(index)">
-            <input
-              :id="getOptionElementId(index)"
-              type="radio"
-              class="oc-radiobutton"
-              v-model="selectedOption"
-              :value="option"
-              @change="onSelectedOption"
-            />
-            {{ option.displayValue }}
-          </label>
+          <oc-radio
+            v-model="selectedOption"
+            :option="option"
+            @input="onSelectedOption"
+            :label="option.displayValue"
+          />
         </li>
       </ul>
     </oc-drop>