diff --git a/apps/frontend/src/routes/(auth)/login/+page.svelte b/apps/frontend/src/routes/(auth)/login/+page.svelte
index 0a1cf5319..64d795205 100644
--- a/apps/frontend/src/routes/(auth)/login/+page.svelte
+++ b/apps/frontend/src/routes/(auth)/login/+page.svelte
@@ -209,7 +209,7 @@
           <div class="mt-4 text-center text-sm">
             Don&apos;t have an account?
             {#if redirect}
-              <a href="/signup?redirect={redirect}" class="underline"> Sign up </a>
+              <a href="/signup?redirect={encodeURIComponent(redirect)}" class="underline"> Sign up </a>
             {:else}
               <a href="/signup" class="underline"> Sign up </a>
             {/if}
diff --git a/apps/frontend/src/routes/(auth)/signup/+page.svelte b/apps/frontend/src/routes/(auth)/signup/+page.svelte
index 950ef74bf..ba9c6b270 100644
--- a/apps/frontend/src/routes/(auth)/signup/+page.svelte
+++ b/apps/frontend/src/routes/(auth)/signup/+page.svelte
@@ -63,7 +63,7 @@
     },
     async onSuccess(data, variables, context) {
       if (redirect) {
-        await goto(redirect)
+        window.location.href = redirect
       } else {
         await goto("/")
       }
@@ -245,7 +245,7 @@
           {#if invitationId}
             <a href={`/login?invitationId=${invitationId}`} class="underline"> Sign in </a>
           {:else if redirect}
-            <a href={`/login?redirect=${redirect}`} class="underline"> Sign in </a>
+            <a href={`/login?redirect=${encodeURIComponent(redirect)}`} class="underline"> Sign in </a>
           {:else}
             <a href="/login" class="underline"> Sign in </a>
           {/if}