diff --git a/packages/frontend/src/pages/admin/roles.policy-editor.form.vue b/packages/frontend/src/pages/admin/roles.policy-editor.form.vue
index fd47ffbce3..3686034e2e 100644
--- a/packages/frontend/src/pages/admin/roles.policy-editor.form.vue
+++ b/packages/frontend/src/pages/admin/roles.policy-editor.form.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 </MkInput>
 <MkTextarea
@@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 </MkTextarea>
 <MkInput
@@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 	<template #prefix>{{ def.inputPrefix }}</template>
 	<template #suffix>{{ def.inputSuffix }}</template>
@@ -59,7 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 	<template #prefix>{{ def.inputPrefix }}</template>
 	<template #suffix>{{ def.inputSuffix }}</template>
@@ -73,7 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 	<option v-for="option in def.enum" :key="option.value" :value="option.value">{{ option.label }}</option>
 </MkSelect>
@@ -85,7 +85,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #label>{{ def.inputLabel ?? i18n.ts.enable }}</template>
 	<template #caption>
 		<span v-if="typeof def.inputCaption === 'string'">{{ def.inputCaption }}</span>
-		<component v-else :is="def.inputCaption" />
+		<component :is="def.inputCaption" v-else />
 	</template>
 </MkSwitch>
 </template>
diff --git a/packages/frontend/src/pages/admin/roles.policy-editor.vue b/packages/frontend/src/pages/admin/roles.policy-editor.vue
index da1a85304d..f0a0886350 100644
--- a/packages/frontend/src/pages/admin/roles.policy-editor.vue
+++ b/packages/frontend/src/pages/admin/roles.policy-editor.vue
@@ -26,8 +26,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkSwitch>
 
 			<XForm
-				:def="def"
 				v-model="model[key].value"
+				:def="def"
 				:disabled="withUseDefault && model[key].useDefault"
 				:readonly="readonly"
 			/>
@@ -73,8 +73,8 @@ const props = withDefaults(defineProps<{
 type RolePolicyEditorValueItem = {
 	value: GetRolePolicyEditorValuesType<typeof rolePolicyEditorDef[keyof typeof rolePolicyEditorDef]>;
 } & (
-	(UD extends true ? { useDefault: boolean } : {}) &
-	(WP extends true ? { priority: 0 | 1 | 2 } : {})
+	(UD extends true ? { useDefault: boolean } : never) &
+	(WP extends true ? { priority: 0 | 1 | 2 } : never)
 );
 
 type RolePolicyEditorValue = {
diff --git a/packages/frontend/src/types/role-policy-editor.ts b/packages/frontend/src/types/role-policy-editor.ts
index 21d543d537..77ea6d3080 100644
--- a/packages/frontend/src/types/role-policy-editor.ts
+++ b/packages/frontend/src/types/role-policy-editor.ts
@@ -16,7 +16,7 @@ interface RolePolicyEditorItemBase<T = unknown> {
 
 export type RolePolicyEditorItemBaseFolderSuffixGetter = {
 	folderSuffix: (value: boolean | number | string) => string;
-}
+};
 
 interface RolePolicyEditorItemBoolean extends RolePolicyEditorItemBase<boolean> {
 	type: 'boolean';