diff --git a/web/src/routes/test/+page.ts b/web/src/routes/test/+page.ts
new file mode 100644
index 0000000..9d0e33a
--- /dev/null
+++ b/web/src/routes/test/+page.ts
@@ -0,0 +1,18 @@
+import { error, redirect, type Load } from "@sveltejs/kit";
+
+import { createTest as apiCreateTest } from "$lib/api";
+
+export const load: Load = async ({ }) => {
+    let response;
+    try {
+        response = await apiCreateTest();
+    } catch (err) {
+        error(err.response.status, err.message);
+    }
+
+    if (response.response.ok) {
+        redirect(302, `/test/${response.data.id}`);
+    } else {
+        error(response.response.status, response.error);
+    }
+}
diff --git a/web/src/routes/test/[test]/+page.svelte b/web/src/routes/test/[test]/+page.svelte
index f516bb6..f9d3b3f 100644
--- a/web/src/routes/test/[test]/+page.svelte
+++ b/web/src/routes/test/[test]/+page.svelte
@@ -133,7 +133,7 @@
             <!-- Test Again Button -->
             <div class="row">
                 <div class="col-12 text-center">
-                    <a href="/" class="btn btn-primary btn-lg">
+                    <a href="/test/" class="btn btn-primary btn-lg">
                         <i class="bi bi-arrow-repeat me-2"></i>
                         Test Another Email
                     </a>