diff --git a/src/routes/private/events/creator/emailtest/+page.svelte b/src/routes/private/events/creator/emailtest/+page.svelte
index 6bfab5d..3d67361 100644
--- a/src/routes/private/events/creator/emailtest/+page.svelte
+++ b/src/routes/private/events/creator/emailtest/+page.svelte
@@ -31,7 +31,8 @@ onMount(async () => {
 
 const connect = () => goto('/private/api/gmail?action=auth');
 
-async function sendTestEmail() {
+async function sendTestEmail(event: Event) {
+	event.preventDefault();
 	error = '';
 	success = '';
 	loading = true;
@@ -70,8 +71,7 @@ async function sendTestEmail() {
 				Connect Google
 			</button>
 		</div>
-	{:else}
-		<form on:submit|preventDefault={sendTestEmail} class="space-y-4">
+		<form onsubmit={sendTestEmail} class="space-y-4">
 			<label class="block">
 				<span class="text-gray-700">To</span>
 				<input type="email" class="mt-1 block w-full border border-gray-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-200" bind:value={to} required />
diff --git a/src/routes/private/events/creator/steps/StepCraftEmail.svelte b/src/routes/private/events/creator/steps/StepCraftEmail.svelte
index 302b816..bd914c0 100644
--- a/src/routes/private/events/creator/steps/StepCraftEmail.svelte
+++ b/src/routes/private/events/creator/steps/StepCraftEmail.svelte
@@ -20,7 +20,7 @@
 </script>
 
 {#if showForm}
-	<form on:submit={handleSubmit} class="flex flex-col space-y-4 bg-white p-8 rounded border border-gray-300 w-full shadow-none">
+	<form onsubmit={handleSubmit} class="flex flex-col space-y-4 bg-white p-8 rounded border border-gray-300 w-full shadow-none">
 		<h2 class="text-2xl font-semibold text-center mb-4">Craft Email</h2>
 		<label class="flex flex-col text-gray-700">
 			Subject