diff --git a/template/app/src/auth/LoginPage.tsx b/template/app/src/auth/LoginPage.tsx
index 4d3a02995..d74fc0842 100644
--- a/template/app/src/auth/LoginPage.tsx
+++ b/template/app/src/auth/LoginPage.tsx
@@ -1,8 +1,19 @@
-import { LoginForm } from "wasp/client/auth";
+import { useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import { LoginForm, useAuth } from "wasp/client/auth";
 import { Link as WaspRouterLink, routes } from "wasp/client/router";
 import { AuthPageLayout } from "./AuthPageLayout";
 
 export default function Login() {
+  const { data: user } = useAuth();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (user) {
+      navigate("/demo-app");
+    }
+  }, [user, navigate]);
+
   return (
     <AuthPageLayout>
       <LoginForm />
diff --git a/template/app/src/auth/SignupPage.tsx b/template/app/src/auth/SignupPage.tsx
index 0afa0b083..87a7f9ff0 100644
--- a/template/app/src/auth/SignupPage.tsx
+++ b/template/app/src/auth/SignupPage.tsx
@@ -1,8 +1,19 @@
-import { SignupForm } from "wasp/client/auth";
+import { useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import { SignupForm, useAuth } from "wasp/client/auth";
 import { Link as WaspRouterLink, routes } from "wasp/client/router";
 import { AuthPageLayout } from "./AuthPageLayout";
 
 export function Signup() {
+  const { data: user } = useAuth();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (user) {
+      navigate("/demo-app");
+    }
+  }, [user, navigate]);
+
   return (
     <AuthPageLayout>
       <SignupForm />
diff --git a/template/app/src/payment/stripe/webhook.ts b/template/app/src/payment/stripe/webhook.ts
index 44d1924d6..d0a7cd402 100644
--- a/template/app/src/payment/stripe/webhook.ts
+++ b/template/app/src/payment/stripe/webhook.ts
@@ -141,7 +141,7 @@ async function handleInvoicePaid(
 
 function getInvoicePriceId(invoice: Stripe.Invoice): Stripe.Price["id"] {
   const invoiceLineItems = invoice.lines.data;
-  // We only expect one line item. 
+  // We only expect one line item.
   // If your workflow expects more, you should change this function to handle them.
   if (invoiceLineItems.length !== 1) {
     throw new Error("There should be exactly one line item in Stripe invoice");
@@ -204,7 +204,7 @@ function getSubscriptionPriceId(
   subscription: Stripe.Subscription,
 ): Stripe.Price["id"] {
   const subscriptionItems = subscription.items.data;
-  // We only expect one subscription item. 
+  // We only expect one subscription item.
   // If your workflow expects more, you should change this function to handle them.
   if (subscriptionItems.length !== 1) {
     throw new Error(
diff --git a/template/e2e-tests/tests/authRedirectTests.spec.ts b/template/e2e-tests/tests/authRedirectTests.spec.ts
new file mode 100644
index 000000000..c384eedf1
--- /dev/null
+++ b/template/e2e-tests/tests/authRedirectTests.spec.ts
@@ -0,0 +1,38 @@
+import { expect, test, type Page } from "@playwright/test";
+import { createRandomUser, logUserIn, signUserUp, type User } from "./utils";
+
+let page: Page;
+let testUser: User;
+
+test.describe.configure({ mode: "serial" });
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+  testUser = createRandomUser();
+  await signUserUp({ page, user: testUser });
+  await logUserIn({ page, user: testUser });
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test.describe("auth redirect tests", () => {
+  test("logged-in user visiting /login should redirect to /demo-app", async () => {
+    // User is already logged in from beforeAll
+    await page.goto("/login");
+
+    // Should be redirected to /demo-app
+    await page.waitForURL("**/demo-app", { timeout: 5000 });
+    expect(page.url()).toContain("/demo-app");
+  });
+
+  test("logged-in user visiting /signup should redirect to /demo-app", async () => {
+    // User is already logged in from beforeAll
+    await page.goto("/signup");
+
+    // Should be redirected to /demo-app
+    await page.waitForURL("**/demo-app", { timeout: 5000 });
+    expect(page.url()).toContain("/demo-app");
+  });
+});