diff --git a/src/components/Container/ManageEmailsPage.vue b/src/components/Container/ManageEmailsPage.vue
index 0326b143f..628ffb79f 100644
--- a/src/components/Container/ManageEmailsPage.vue
+++ b/src/components/Container/ManageEmailsPage.vue
@@ -349,7 +349,6 @@ export default {
 			template = template || {};
 			this.currentTemplate = template;
 			const {openSideModal} = useModal();
-
 			this.$nextTick(() =>
 				openSideModal(EditTemplateModal, {
 					title: this.currentTemplate
@@ -412,10 +411,8 @@ export default {
 			// Remove user group fields if current mailable does not support specifying user group access
 			if (!this.currentMailable.canAssignUserGroupToTemplates) {
 				templateForm.fields = templateForm.fields.filter(
-					(field) => field.name !== 'userGroupIds',
-				);
-				templateForm.fields = templateForm.fields.filter(
-					(field) => field.name !== 'isUnrestricted',
+					(field) =>
+						!['assignedUserGroupIds', 'isUnrestricted'].includes(field.name),
 				);
 			}
 
@@ -431,21 +428,6 @@ export default {
 						};
 					});
 				}
-
-				if (field.name === 'userGroupIds') {
-					field.assignableUserGroups =
-						this.currentMailable['assignableTemplateUserGroups'];
-					field.assignedUserGroupIds =
-						this.currentTemplate['assignedUserGroupIds'] || [];
-					field.isUnrestricted =
-						this.currentTemplate['isUnrestricted'] || false;
-				}
-
-				if (field.name === 'isUnrestricted') {
-					field.isUnrestricted =
-						this.currentTemplate['isUnrestricted'] || false;
-				}
-
 				return field;
 			});
 
diff --git a/src/components/Form/FormGroup.vue b/src/components/Form/FormGroup.vue
index 9d2151acc..ce7b6087c 100644
--- a/src/components/Form/FormGroup.vue
+++ b/src/components/Form/FormGroup.vue
@@ -78,8 +78,6 @@ import FieldTextarea from './fields/FieldTextarea.vue';
 import FieldUpload from './fields/FieldUpload.vue';
 import FieldSlider from './fields/FieldSlider.vue';
 import FieldUploadImage from './fields/FieldUploadImage.vue';
-import FieldEmailTemplateUserGroupSettings from './fields/FieldEmailTemplateUserGroupSettings.vue';
-import FieldEmailTemplateUnrestricted from './fields/FieldEmailTemplateUnrestricted.vue';
 
 import {shouldShowFieldWithinGroup} from './formHelpers';
 
@@ -111,8 +109,6 @@ export default {
 		FieldSlider,
 		FieldUpload,
 		FieldUploadImage,
-		FieldEmailTemplateUserGroupSettings,
-		FieldEmailTemplateUnrestricted,
 	},
 	props: {
 		id: String,
diff --git a/src/components/Form/fields/FieldEmailTemplateUnrestricted.vue b/src/components/Form/fields/FieldEmailTemplateUnrestricted.vue
deleted file mode 100644
index 6e7c9535c..000000000
--- a/src/components/Form/fields/FieldEmailTemplateUnrestricted.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-	<div class="mt-4">
-		<FormFieldLabel :label="label" />
-		<span class="mb-4 mt-4 flex gap-2 border-b border-b-light italic">
-			<input
-				ref="input"
-				v-model="currentValue"
-				class="col-span-1"
-				name="isUnrestricted"
-				type="checkbox"
-			/>
-			<label>
-				Mark as unrestricted
-				<sub>
-					Unrestricted templates will be accessible to all user groups
-					associated with this template
-				</sub>
-			</label>
-		</span>
-
-		<FormFieldLabel :label="label" />
-	</div>
-</template>
-
-<script>
-import FieldBase from '@/components/Form/fields/FieldBase.vue';
-import FormFieldLabel from '@/components/Form/FormFieldLabel.vue';
-
-export default {
-	name: 'FieldEmailTemplateUnrestricted',
-	components: {FormFieldLabel},
-	extends: FieldBase,
-	props: {
-		isUnrestricted: {
-			type: Boolean,
-		},
-	},
-	data() {
-		return {};
-	},
-	computed: {},
-	created() {},
-	mounted() {
-		this.currentValue = this.isUnrestricted;
-	},
-	methods: {},
-};
-</script>
-
-<style lang="less">
-@import '../../../styles/_import';
-</style>
diff --git a/src/components/Form/fields/FieldEmailTemplateUserGroupSettings.vue b/src/components/Form/fields/FieldEmailTemplateUserGroupSettings.vue
deleted file mode 100644
index b223317d2..000000000
--- a/src/components/Form/fields/FieldEmailTemplateUserGroupSettings.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-	<div class="mt-4">
-		<FormFieldLabel :label="label" />
-		<template v-for="group in assignableUserGroups" :key="group.id">
-			<span class="flex gap-2">
-				<input
-					ref="input"
-					v-model="currentValue"
-					:value="group.id"
-					class="col-span-1"
-					name="userGroupIds"
-					type="checkbox"
-				/>
-				<label :for="group.id" class="col-span-1">{{ group.name }}</label>
-			</span>
-		</template>
-	</div>
-</template>
-
-<script>
-import FieldBase from '@/components/Form/fields/FieldBase.vue';
-import FormFieldLabel from '@/components/Form/FormFieldLabel.vue';
-
-export default {
-	name: 'UserGroupIds',
-	components: {FormFieldLabel},
-	extends: FieldBase,
-	props: {
-		assignedUserGroupIds: {
-			type: Array,
-			required: true,
-			default: () => [],
-		},
-		assignableUserGroups: {
-			type: Array,
-			required: true,
-			default: () => [],
-		},
-	},
-	data() {
-		return {
-			userGroupIds: [],
-		};
-	},
-	computed: {},
-	created() {},
-	mounted() {
-		this.currentValue = this.assignedUserGroupIds;
-	},
-};
-</script>
-
-<style lang="less">
-@import '../../../styles/_import';
-</style>