diff --git a/apps/webapp/app/routes/login._index/route.tsx b/apps/webapp/app/routes/login._index/route.tsx
index 8878ffc8889..592ecd3f7c0 100644
--- a/apps/webapp/app/routes/login._index/route.tsx
+++ b/apps/webapp/app/routes/login._index/route.tsx
@@ -128,7 +128,7 @@ export default function LoginPage() {
               <div className="relative w-full">
                 {data.lastAuthMethod === "github" && <LastUsedBadge />}
                 <Form
-                  action={`/auth/github${data.redirectTo ? `?redirectTo=${data.redirectTo}` : ""}`}
+                  action={`/auth/github${data.redirectTo ? `?redirectTo=${encodeURIComponent(data.redirectTo)}` : ""}`}
                   method="post"
                   className="w-full"
                 >
@@ -148,7 +148,7 @@ export default function LoginPage() {
               <div className="relative w-full">
                 {data.lastAuthMethod === "google" && <LastUsedBadge />}
                 <Form
-                  action={`/auth/google${data.redirectTo ? `?redirectTo=${data.redirectTo}` : ""}`}
+                  action={`/auth/google${data.redirectTo ? `?redirectTo=${encodeURIComponent(data.redirectTo)}` : ""}`}
                   method="post"
                   className="w-full"
                 >