diff --git a/src/lib/components/ContactForm.svelte b/src/lib/components/ContactForm.svelte
index e803e021..08787628 100644
--- a/src/lib/components/ContactForm.svelte
+++ b/src/lib/components/ContactForm.svelte
@@ -9,9 +9,7 @@
 </script>
 
 <script lang="ts">
-	import type { IContactUsMessage } from '$api/contact/types';
-
-	import { contactUsValidator } from '$api/contact/validator';
+	import { contactUsValidator, discordRequestValidator } from '$api/contact/validator';
 	import { page } from '$app/state';
 	import ValidatedInput from '$components/form/ValidatedInput.svelte';
 	import ValidatedSelect from '$components/form/ValidatedSelect.svelte';
@@ -20,27 +18,20 @@
 	import apiRequest from '$lib/util/apiClient';
 	import { Button, Spinner, type SelectOptionType } from 'flowbite-svelte';
 	import { PaperPlaneOutline } from 'flowbite-svelte-icons';
-	import type { ObjectSchema } from 'yup';
 
 	interface Props {
-		emailRequired?: boolean;
 		feedbackType?: string;
-		validator?: ObjectSchema<IContactUsMessage>;
 	}
 
-	let { emailRequired = false, feedbackType, validator = contactUsValidator }: Props = $props();
+	let { feedbackType }: Props = $props();
 
 	const notificationContext = getNotificationContext();
 
 	let emailInput: ValidatedInput<'email'> | undefined = $state();
-	let typeInput: ValidatedSelect<'type'> | string | undefined = $state();
+	let typeInput: ValidatedSelect<'type'> | undefined = $state();
 	let nameInput: ValidatedInput<'name'> | undefined = $state();
 	let messageInput: ValidatedTextarea<'message'> | undefined = $state();
 
-	if (feedbackType !== undefined) {
-		typeInput = feedbackType;
-	}
-
 	let loading = $state(false);
 
 	let name = $state('');
@@ -48,6 +39,13 @@
 	let email = $state('');
 	let message = $state('');
 
+	if (feedbackType !== undefined) {
+		type = feedbackType;
+	}
+
+	let emailRequired = $derived(type == 'discord' ? true : false);
+	let validator = $derived(type == 'discord' ? discordRequestValidator : contactUsValidator);
+
 	async function onsubmit(e: Event) {
 		e.preventDefault();
 
diff --git a/src/routes/(public)/discord/+page.svelte b/src/routes/(public)/discord/+page.svelte
index 0991315a..37ceacca 100644
--- a/src/routes/(public)/discord/+page.svelte
+++ b/src/routes/(public)/discord/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { discordRequestValidator } from '$api/contact/validator';
 	import ContactForm from '$components/ContactForm.svelte';
 	import ExternalLink from '$components/ExternalLink.svelte';
 	import SectionHeader from '$components/SectionHeader.svelte';
@@ -19,6 +18,6 @@
 			staff member, be sure to use the contact form to get in touch.
 		</p>
 		<SectionHeader title="Request access" />
-		<ContactForm emailRequired feedbackType="discord" validator={discordRequestValidator} />
+		<ContactForm feedbackType="discord" />
 	</div>
 </div>