diff --git a/apps/web/pages/auth/login.tsx b/apps/web/pages/auth/login.tsx
index ef258adbd6..b410aeccb8 100644
--- a/apps/web/pages/auth/login.tsx
+++ b/apps/web/pages/auth/login.tsx
@@ -95,7 +95,7 @@ export default function Login({
   callbackUrl = safeCallbackUrl || "";
 
   const LoginFooter = (
-    <Link href="/signup" className="text-brand-500 font-medium">
+    <Link href={`${WEBSITE_URL}/signup`} className="text-brand-500 font-medium">
       {t("dont_have_an_account")}
     </Link>
   );
diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx
index c50028112d..a9eda0f821 100644
--- a/apps/web/pages/signup.tsx
+++ b/apps/web/pages/signup.tsx
@@ -356,7 +356,7 @@ export default function Signup({ prepopulateFormValues, token, orgSlug }: Signup
                   // @NOTE: don't remove username query param as it's required right now for stripe payment page
                   sp.set("username", formMethods.getValues("username"));
                   sp.set("email", formMethods.getValues("email"));
-                  router.push(process.env.NEXT_PUBLIC_WEBAPP_URL + "/auth/sso/saml" + "?" + sp.toString());
+                  router.push(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/auth/sso/saml` + `?${sp.toString()}`);
                 }}>
                 <ShieldCheckIcon className="mr-2 h-5 w-5" />
                 {t("saml_sso")}