diff --git a/apps/docs/components/Navigation/NavigationMenu/GlobalMobileMenu.tsx b/apps/docs/components/Navigation/NavigationMenu/GlobalMobileMenu.tsx
index 619222551c2..f0bdd88d1a0 100644
--- a/apps/docs/components/Navigation/NavigationMenu/GlobalMobileMenu.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/GlobalMobileMenu.tsx
@@ -168,7 +168,9 @@ const GlobalMobileMenu = ({ open, setOpen }: Props) => {
                         <Link href="https://supabase.com/dashboard/sign-in">Sign in</Link>
                       </Button>
                       <Button block size="medium" asChild>
-                        <Link href="https://supabase.com/dashboard/new">Start your project</Link>
+                        <Link href="https://supabase.com/dashboard/sign-up">
+                          Start your project
+                        </Link>
                       </Button>
                     </>
                   )}
diff --git a/apps/studio/pages/sign-in.tsx b/apps/studio/pages/sign-in.tsx
index 9cf0b1c6ea5..c000ad453bd 100644
--- a/apps/studio/pages/sign-in.tsx
+++ b/apps/studio/pages/sign-in.tsx
@@ -16,6 +16,7 @@ import { useInboundBranding } from '@/hooks/misc/useInboundBranding'
 import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
 import { IS_PLATFORM } from '@/lib/constants'
 import type { ExternalIdentityProviderConfig } from '@/lib/external-identity-providers'
+import { getSignUpReturnTo } from '@/lib/gotrue'
 import type { NextPageWithLayout } from '@/types'
 
 const SignInPage: NextPageWithLayout = () => {
@@ -131,7 +132,10 @@ const SignInPage: NextPageWithLayout = () => {
         <div className="self-center my-8 text-sm">
           <span className="text-foreground-light">Don’t have an account?</span>{' '}
           <Link
-            href={{ pathname: '/sign-up', query: router.query }}
+            href={{
+              pathname: '/sign-up',
+              query: { ...router.query, returnTo: getSignUpReturnTo(router.query.returnTo) },
+            }}
             className="underline transition text-foreground hover:text-foreground-light"
           >
             Sign up
diff --git a/apps/www/app/(home)/_components/CTASection.tsx b/apps/www/app/(home)/_components/CTASection.tsx
index 346b93b89f2..2c8baf2412d 100644
--- a/apps/www/app/(home)/_components/CTASection.tsx
+++ b/apps/www/app/(home)/_components/CTASection.tsx
@@ -1,10 +1,14 @@
 'use client'
 
 import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsLoggedIn } from 'common'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
+
 export function CTASection() {
+  const isLoggedIn = useIsLoggedIn()
   const sendTelemetryEvent = useSendTelemetryEvent()
 
   return (
@@ -17,7 +21,7 @@ export function CTASection() {
         <div className="flex items-center gap-2">
           <Button asChild size="medium">
             <Link
-              href="https://supabase.com/dashboard"
+              href={getDashboardCtaHref(isLoggedIn)}
               onClick={() =>
                 sendTelemetryEvent({
                   action: 'start_project_button_clicked',
diff --git a/apps/www/app/(home)/_components/Hero.tsx b/apps/www/app/(home)/_components/Hero.tsx
index d9625dcb7e9..58adeb119c1 100644
--- a/apps/www/app/(home)/_components/Hero.tsx
+++ b/apps/www/app/(home)/_components/Hero.tsx
@@ -1,12 +1,15 @@
 'use client'
 
 import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsLoggedIn } from 'common'
 import Link from 'next/link'
 import { Button } from 'ui'
 
 import SectionContainer from '@/components/Layouts/SectionContainer'
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
 
 export function Hero() {
+  const isLoggedIn = useIsLoggedIn()
   const sendTelemetryEvent = useSendTelemetryEvent()
 
   return (
@@ -25,7 +28,7 @@ export function Hero() {
         <div className="flex items-center gap-2">
           <Button asChild size="medium">
             <Link
-              href="https://supabase.com/dashboard"
+              href={getDashboardCtaHref(isLoggedIn)}
               onClick={() =>
                 sendTelemetryEvent({
                   action: 'start_project_button_clicked',
diff --git a/apps/www/app/(products)/auth/_components/Hero.tsx b/apps/www/app/(products)/auth/_components/Hero.tsx
index 4b6e59b9eda..3d99c400e12 100644
--- a/apps/www/app/(products)/auth/_components/Hero.tsx
+++ b/apps/www/app/(products)/auth/_components/Hero.tsx
@@ -2,6 +2,8 @@ import SectionContainerWithCn from '~/components/Layouts/SectionContainerWithCn'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 export function Hero() {
   return (
     <SectionContainerWithCn>
@@ -17,9 +19,7 @@ export function Hero() {
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/auth">Documentation</Link>
           </Button>
diff --git a/apps/www/app/(products)/database/_components/Hero.tsx b/apps/www/app/(products)/database/_components/Hero.tsx
index bd9249d04a9..778c147e7f9 100644
--- a/apps/www/app/(products)/database/_components/Hero.tsx
+++ b/apps/www/app/(products)/database/_components/Hero.tsx
@@ -2,6 +2,8 @@ import SectionContainerWithCn from '~/components/Layouts/SectionContainerWithCn'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 export function Hero() {
   return (
     <SectionContainerWithCn>
@@ -17,9 +19,7 @@ export function Hero() {
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/database/overview">Documentation</Link>
           </Button>
diff --git a/apps/www/app/(products)/edge-functions/_components/CTASection.tsx b/apps/www/app/(products)/edge-functions/_components/CTASection.tsx
index fcba5d1665f..af5f4df924a 100644
--- a/apps/www/app/(products)/edge-functions/_components/CTASection.tsx
+++ b/apps/www/app/(products)/edge-functions/_components/CTASection.tsx
@@ -6,6 +6,8 @@ import Link from 'next/link'
 import { useEffect, useRef, useState } from 'react'
 import { Button } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 const TERMINAL_LINES = [
   { text: '$ supabase functions new hello-world', delay: 0 },
   { text: 'Created function: supabase/functions/hello-world/index.ts', delay: 0.3, dim: true },
@@ -80,9 +82,7 @@ export function CTASection() {
         <TerminalAnimation />
 
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/functions/quickstart">Quickstart guide</Link>
           </Button>
diff --git a/apps/www/app/(products)/edge-functions/_components/Hero.tsx b/apps/www/app/(products)/edge-functions/_components/Hero.tsx
index 3386fafb288..a5973d1d731 100644
--- a/apps/www/app/(products)/edge-functions/_components/Hero.tsx
+++ b/apps/www/app/(products)/edge-functions/_components/Hero.tsx
@@ -3,6 +3,7 @@ import Link from 'next/link'
 import { Button } from 'ui'
 
 import { Highlights } from './Highlights'
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
 
 export function Hero() {
   return (
@@ -19,9 +20,7 @@ export function Hero() {
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/functions">Documentation</Link>
           </Button>
diff --git a/apps/www/app/(products)/realtime/_components/Hero.tsx b/apps/www/app/(products)/realtime/_components/Hero.tsx
index ab998add2d0..121d517500b 100644
--- a/apps/www/app/(products)/realtime/_components/Hero.tsx
+++ b/apps/www/app/(products)/realtime/_components/Hero.tsx
@@ -2,6 +2,8 @@ import SectionContainerWithCn from '~/components/Layouts/SectionContainerWithCn'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 export function Hero() {
   return (
     <SectionContainerWithCn>
@@ -17,9 +19,7 @@ export function Hero() {
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/realtime">Documentation</Link>
           </Button>
diff --git a/apps/www/app/(products)/storage/_components/Hero.tsx b/apps/www/app/(products)/storage/_components/Hero.tsx
index e3f3eb3de7d..d6147591b13 100644
--- a/apps/www/app/(products)/storage/_components/Hero.tsx
+++ b/apps/www/app/(products)/storage/_components/Hero.tsx
@@ -2,6 +2,8 @@ import SectionContainerWithCn from '~/components/Layouts/SectionContainerWithCn'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 export function Hero() {
   return (
     <SectionContainerWithCn>
@@ -17,9 +19,7 @@ export function Hero() {
           </p>
         </div>
         <div className="flex items-center gap-2">
-          <Button asChild size="medium">
-            <Link href="https://supabase.com/dashboard">Start your project</Link>
-          </Button>
+          <StartYourProjectButton />
           <Button asChild size="medium" variant="default">
             <Link href="/docs/guides/storage">Documentation</Link>
           </Button>
diff --git a/apps/www/components/CTABanner/index.tsx b/apps/www/components/CTABanner/index.tsx
index 42efbe627ff..01532b181c4 100644
--- a/apps/www/components/CTABanner/index.tsx
+++ b/apps/www/components/CTABanner/index.tsx
@@ -1,8 +1,11 @@
 'use client'
 
+import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsLoggedIn } from 'common'
 import Link from 'next/link'
 import { Button, cn } from 'ui'
-import { useSendTelemetryEvent } from '~/lib/telemetry'
+
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
 
 interface Props {
   className?: string
@@ -10,6 +13,7 @@ interface Props {
 }
 
 const CTABanner = ({ darkerBg, className }: Props) => {
+  const isLoggedIn = useIsLoggedIn()
   const sendTelemetryEvent = useSendTelemetryEvent()
   return (
     <div
@@ -28,7 +32,7 @@ const CTABanner = ({ darkerBg, className }: Props) => {
       <div className="flex items-center justify-center gap-2 col-span-12 mt-4">
         <Button asChild size="medium">
           <Link
-            href="https://supabase.com/dashboard"
+            href={getDashboardCtaHref(isLoggedIn)}
             onClick={() =>
               sendTelemetryEvent({
                 action: 'start_project_button_clicked',
diff --git a/apps/www/components/CTASection.tsx b/apps/www/components/CTASection.tsx
index 346b93b89f2..2c8baf2412d 100644
--- a/apps/www/components/CTASection.tsx
+++ b/apps/www/components/CTASection.tsx
@@ -1,10 +1,14 @@
 'use client'
 
 import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsLoggedIn } from 'common'
 import Link from 'next/link'
 import { Button } from 'ui'
 
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
+
 export function CTASection() {
+  const isLoggedIn = useIsLoggedIn()
   const sendTelemetryEvent = useSendTelemetryEvent()
 
   return (
@@ -17,7 +21,7 @@ export function CTASection() {
         <div className="flex items-center gap-2">
           <Button asChild size="medium">
             <Link
-              href="https://supabase.com/dashboard"
+              href={getDashboardCtaHref(isLoggedIn)}
               onClick={() =>
                 sendTelemetryEvent({
                   action: 'start_project_button_clicked',
diff --git a/apps/www/components/Sections/ProductHeader.tsx b/apps/www/components/Sections/ProductHeader.tsx
index 897c6033823..9dc87137734 100644
--- a/apps/www/components/Sections/ProductHeader.tsx
+++ b/apps/www/components/Sections/ProductHeader.tsx
@@ -1,9 +1,11 @@
 import { useSendTelemetryEvent } from '~/lib/telemetry'
+import { useIsLoggedIn } from 'common'
 import { BookOpen } from 'lucide-react'
 import Link from 'next/link'
 import { Button } from 'ui'
 
 import ProductIcon from '../ProductIcon'
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
 
 type subheader = string
 interface Types {
@@ -18,6 +20,7 @@ interface Types {
 }
 
 const ProductHeader = (props: Types) => {
+  const isLoggedIn = useIsLoggedIn()
   const sendTelemetryEvent = useSendTelemetryEvent()
   return (
     <div className="section-container relative pt-16 pb-0 lg:pt-28">
@@ -52,8 +55,7 @@ const ProductHeader = (props: Types) => {
           <div className="flex flex-row md:flex-row md:items-center">
             <Button asChild size="medium">
               <Link
-                href="https://supabase.com/dashboard"
-                as="https://supabase.com/dashboard"
+                href={getDashboardCtaHref(isLoggedIn)}
                 onClick={() =>
                   sendTelemetryEvent({
                     action: 'start_project_button_clicked',
diff --git a/apps/www/components/Sections/ProductHeader2.tsx b/apps/www/components/Sections/ProductHeader2.tsx
index 0776557ad1b..a060c052140 100644
--- a/apps/www/components/Sections/ProductHeader2.tsx
+++ b/apps/www/components/Sections/ProductHeader2.tsx
@@ -1,10 +1,14 @@
-import { CTA } from '~/types/common'
+'use client'
+
+import type { CTA } from '~/types/common'
+import { useIsLoggedIn } from 'common'
 import Link from 'next/link'
 import React, { Children, type ReactNode } from 'react'
 import { Button, cn } from 'ui'
 
 import SectionContainerWithCn from '../Layouts/SectionContainerWithCn'
 import ProductIcon from '../ProductIcon'
+import { resolveDashboardCtaHref } from '@/lib/dashboard-links'
 
 // to do: move types to be global
 // then solutions.types.ts should extend this
@@ -22,83 +26,90 @@ interface Props {
   sectionContainerClassName?: string
 }
 
-const ProductHeader = ({ footerPosition = 'left', ...props }: Props) => (
-  <div
-    className={cn(
-      'w-full max-w-full relative mx-auto py-16 lg:py-24 border-b bg-alternative overflow-hidden',
-      props.className
-    )}
-  >
-    <SectionContainerWithCn
-      height="none"
-      className={cn('grid grid-cols-12', props.sectionContainerClassName)}
+const ProductHeader = ({ footerPosition = 'left', ...props }: Props) => {
+  const isLoggedIn = useIsLoggedIn()
+
+  return (
+    <div
+      className={cn(
+        'w-full max-w-full relative mx-auto py-16 lg:py-24 border-b bg-alternative overflow-hidden',
+        props.className
+      )}
     >
-      <div
-        className={cn(
-          'relative z-10 col-span-12 lg:col-span-5',
-          // if not image is present, center the content
-          !props.image &&
-            'lg:col-span-12 lg:mx-auto lg:max-w-2xl text-center flex flex-col items-center'
-        )}
+      <SectionContainerWithCn
+        height="none"
+        className={cn('grid grid-cols-12', props.sectionContainerClassName)}
       >
-        {(props.icon || props.title) && (
-          <div className="mb-4 flex items-center gap-3">
-            {props.icon && <ProductIcon icon={props.icon} />}
-            {props.title && (
-              <span
-                className="text-brand-600 dark:text-brand font-mono uppercase"
-                key={`product-name-${props.title}`}
-              >
-                {props.title}
-              </span>
-            )}
-          </div>
-        )}
-        <h1 className="h1 text-3xl md:text-4xl! lg:text-4xl! 2xl:text-6xl! tracking-[-.15px] text-balance">
-          {props.h1}
-        </h1>
-        {props.subheader && (
-          <div className="">
-            {Children.map(props.subheader, (subheader, i) => {
+        <div
+          className={cn(
+            'relative z-10 col-span-12 lg:col-span-5',
+            // if not image is present, center the content
+            !props.image &&
+              'lg:col-span-12 lg:mx-auto lg:max-w-2xl text-center flex flex-col items-center'
+          )}
+        >
+          {(props.icon || props.title) && (
+            <div className="mb-4 flex items-center gap-3">
+              {props.icon && <ProductIcon icon={props.icon} />}
+              {props.title && (
+                <span
+                  className="text-brand-600 dark:text-brand font-mono uppercase"
+                  key={`product-name-${props.title}`}
+                >
+                  {props.title}
+                </span>
+              )}
+            </div>
+          )}
+          <h1 className="h1 text-3xl md:text-4xl! lg:text-4xl! 2xl:text-6xl! tracking-[-.15px] text-balance">
+            {props.h1}
+          </h1>
+          {props.subheader && (
+            <div className="">
+              {Children.map(props.subheader, (subheader, i) => {
+                return (
+                  <p className="p lg:text-lg max-w-lg lg:max-w-none text-pretty" key={i}>
+                    {subheader}
+                  </p>
+                )
+              })}
+            </div>
+          )}
+          <div className="flex flex-row md:flex-row md:items-center gap-2 mt-4">
+            {props.ctas?.map((cta) => {
+              const href = resolveDashboardCtaHref(cta.href, isLoggedIn)
               return (
-                <p className="p lg:text-lg max-w-lg lg:max-w-none text-pretty" key={i}>
-                  {subheader}
-                </p>
+                <Button
+                  key={cta.href}
+                  size="medium"
+                  variant={cta.type ?? 'default'}
+                  onClick={cta.onClick}
+                  asChild
+                >
+                  <Link href={href}>{cta.label ?? 'Start for free'}</Link>
+                </Button>
               )
             })}
           </div>
-        )}
-        <div className="flex flex-row md:flex-row md:items-center gap-2 mt-4">
-          {props.ctas?.map((cta) => (
-            <Button
-              key={cta.href}
-              size="medium"
-              variant={cta.type ?? 'default'}
-              onClick={cta.onClick}
-              asChild
-            >
-              <Link href={cta.href}>{cta.label ?? 'Start for free'}</Link>
-            </Button>
-          ))}
+          {props.footer && footerPosition === 'left' && (
+            <div className="ph-footer relative z-10 mt-4 md:mt-8 lg:mt-20 xl:mt-32 col-span-12">
+              {props.footer}
+            </div>
+          )}
         </div>
-        {props.footer && footerPosition === 'left' && (
-          <div className="ph-footer relative z-10 mt-4 md:mt-8 lg:mt-20 xl:mt-32 col-span-12">
+        {props.image && (
+          <div className="image-container relative min-h-[300px] col-span-12 mt-8 lg:col-span-7 lg:mt-0 xl:col-span-6 xl:col-start-7">
+            {props.image}
+          </div>
+        )}
+        {props.footer && footerPosition !== 'left' && (
+          <div className="relative z-10 mt-4 md:mt-8 lg:mt-20 xl:mt-32 col-span-12">
             {props.footer}
           </div>
         )}
-      </div>
-      {props.image && (
-        <div className="image-container relative min-h-[300px] col-span-12 mt-8 lg:col-span-7 lg:mt-0 xl:col-span-6 xl:col-start-7">
-          {props.image}
-        </div>
-      )}
-      {props.footer && footerPosition !== 'left' && (
-        <div className="relative z-10 mt-4 md:mt-8 lg:mt-20 xl:mt-32 col-span-12">
-          {props.footer}
-        </div>
-      )}
-    </SectionContainerWithCn>
-  </div>
-)
+      </SectionContainerWithCn>
+    </div>
+  )
+}
 
 export default ProductHeader
diff --git a/apps/www/components/Sections/ProductsCta2.tsx b/apps/www/components/Sections/ProductsCta2.tsx
index d25b2e25d59..dc85a0aa3e9 100644
--- a/apps/www/components/Sections/ProductsCta2.tsx
+++ b/apps/www/components/Sections/ProductsCta2.tsx
@@ -5,6 +5,8 @@ import Link from 'next/link'
 import React from 'react'
 import { Button, cn } from 'ui'
 
+import { StartYourProjectButton } from '@/components/StartYourProjectButton'
+
 export type Products = PRODUCT_SHORTNAMES
 
 interface Props {
@@ -26,9 +28,9 @@ function ProductsCta(props: Props) {
       <div className="flex flex-col col-span-1 text-center xl:text-left xl:justify-center items-center xl:items-start">
         <h2 className="h2 w-max">Ready to start building?</h2>
         <div className="flex gap-2 py-2">
-          <Button asChild variant="primary" size="small" className="h-full">
-            <Link href="https://supabase.com/dashboard">Start for free</Link>
-          </Button>
+          <StartYourProjectButton size="small" className="h-full" variant="primary">
+            Start for free
+          </StartYourProjectButton>
           <Button asChild variant="default" size="small">
             <Link href="https://forms.supabase.com/enterprise">Contact Enterprise</Link>
           </Button>
diff --git a/apps/www/components/StartYourProjectButton.tsx b/apps/www/components/StartYourProjectButton.tsx
new file mode 100644
index 00000000000..4dc263ffd06
--- /dev/null
+++ b/apps/www/components/StartYourProjectButton.tsx
@@ -0,0 +1,34 @@
+'use client'
+
+import { useIsLoggedIn } from 'common'
+import Link from 'next/link'
+import type { ComponentProps } from 'react'
+import { Button } from 'ui'
+
+import { getDashboardCtaHref } from '@/lib/dashboard-links'
+
+type StartYourProjectButtonProps = {
+  children?: React.ReactNode
+  onClick?: ComponentProps<typeof Link>['onClick']
+  size?: ComponentProps<typeof Button>['size']
+  variant?: ComponentProps<typeof Button>['variant']
+  className?: string
+}
+
+export function StartYourProjectButton({
+  children = 'Start your project',
+  onClick,
+  size = 'medium',
+  variant,
+  className,
+}: StartYourProjectButtonProps) {
+  const isLoggedIn = useIsLoggedIn()
+
+  return (
+    <Button asChild size={size} variant={variant} className={className}>
+      <Link href={getDashboardCtaHref(isLoggedIn)} onClick={onClick}>
+        {children}
+      </Link>
+    </Button>
+  )
+}
diff --git a/apps/www/data/solutions/agencies.tsx b/apps/www/data/solutions/agencies.tsx
index ff62db32131..dfb7ccd5c3b 100644
--- a/apps/www/data/solutions/agencies.tsx
+++ b/apps/www/data/solutions/agencies.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import {
   ArrowLeftRight,
   Check,
@@ -85,7 +86,7 @@ const data: {
     ctas: [
       {
         label: 'Start your project',
-        href: 'https://supabase.com/dashboard',
+        href: DASHBOARD_SIGN_UP_URL,
         type: 'primary' as const,
       },
       {
diff --git a/apps/www/data/solutions/agents.tsx b/apps/www/data/solutions/agents.tsx
index 64f5725029e..df28ea71b52 100644
--- a/apps/www/data/solutions/agents.tsx
+++ b/apps/www/data/solutions/agents.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import {
   Check,
   ClipboardCheck,
@@ -91,7 +92,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/ai-builders.tsx b/apps/www/data/solutions/ai-builders.tsx
index 6c98074c4a8..594169e65af 100644
--- a/apps/www/data/solutions/ai-builders.tsx
+++ b/apps/www/data/solutions/ai-builders.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { Timer } from 'lucide-react'
 
 import type {
@@ -39,7 +40,7 @@ const data: {
     ctas: [
       {
         label: 'Start your project',
-        href: 'https://supabase.com/dashboard',
+        href: DASHBOARD_SIGN_UP_URL,
         type: 'primary' as any,
       },
       {
diff --git a/apps/www/data/solutions/b2b-saas.tsx b/apps/www/data/solutions/b2b-saas.tsx
index 1971c2eaa00..ea9aa0971d6 100644
--- a/apps/www/data/solutions/b2b-saas.tsx
+++ b/apps/www/data/solutions/b2b-saas.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import {
   Check,
@@ -91,7 +92,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/beginners.tsx b/apps/www/data/solutions/beginners.tsx
index fd74f32efdc..e67c94e7802 100644
--- a/apps/www/data/solutions/beginners.tsx
+++ b/apps/www/data/solutions/beginners.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import { Check, Sparkles, Timer } from 'lucide-react'
 import dynamic from 'next/dynamic'
@@ -69,7 +70,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/developers.tsx b/apps/www/data/solutions/developers.tsx
index 2975760a26c..6b615404153 100644
--- a/apps/www/data/solutions/developers.tsx
+++ b/apps/www/data/solutions/developers.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import {
   Check,
@@ -85,7 +86,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/finserv.tsx b/apps/www/data/solutions/finserv.tsx
index 60709494d23..32f724e4663 100644
--- a/apps/www/data/solutions/finserv.tsx
+++ b/apps/www/data/solutions/finserv.tsx
@@ -11,6 +11,7 @@ import {
   Users,
   UserX,
 } from 'lucide-react'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { PRODUCT_SHORTNAMES } from 'shared-data/products'
 import { Image } from 'ui-patterns/Image'
 
@@ -90,7 +91,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/hackathon.tsx b/apps/www/data/solutions/hackathon.tsx
index 7fc5f3517e5..79ff8271300 100644
--- a/apps/www/data/solutions/hackathon.tsx
+++ b/apps/www/data/solutions/hackathon.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import { Check, InfoIcon, Sparkles, Timer } from 'lucide-react'
 import dynamic from 'next/dynamic'
@@ -65,7 +66,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/healthcare.tsx b/apps/www/data/solutions/healthcare.tsx
index c2616d4144e..6caf6f13cf0 100644
--- a/apps/www/data/solutions/healthcare.tsx
+++ b/apps/www/data/solutions/healthcare.tsx
@@ -10,6 +10,7 @@ import {
   Users,
   UserX,
 } from 'lucide-react'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { Image } from 'ui-patterns/Image'
 
 import { getSharedSections } from './shared-sections'
@@ -89,7 +90,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/hosted-postgres.tsx b/apps/www/data/solutions/hosted-postgres.tsx
index 4a6798134f4..0a64cbfe456 100644
--- a/apps/www/data/solutions/hosted-postgres.tsx
+++ b/apps/www/data/solutions/hosted-postgres.tsx
@@ -1,4 +1,5 @@
 import { useBreakpoint } from 'common'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import {
   Activity,
   Blocks,
@@ -90,7 +91,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/innovation-teams.tsx b/apps/www/data/solutions/innovation-teams.tsx
index 8c663a3a677..8171da08384 100644
--- a/apps/www/data/solutions/innovation-teams.tsx
+++ b/apps/www/data/solutions/innovation-teams.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import {
   ArrowLeftRight,
@@ -134,7 +135,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start Building',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
@@ -751,7 +752,7 @@ const data: () => {
           description: 'Start free with any AI builder + Supabase',
           cta: {
             label: 'Create Your First App in 5 Minutes',
-            href: 'https://supabase.com/dashboard',
+            href: DASHBOARD_SIGN_UP_URL,
           },
         },
         {
diff --git a/apps/www/data/solutions/no-code.tsx b/apps/www/data/solutions/no-code.tsx
index 5a25f77e2f3..80c5ba8c36b 100644
--- a/apps/www/data/solutions/no-code.tsx
+++ b/apps/www/data/solutions/no-code.tsx
@@ -1,4 +1,5 @@
 import { Check, PointerIcon, TrendingUp, ZapIcon } from 'lucide-react'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import dynamic from 'next/dynamic'
 import { PRODUCT_SHORTNAMES } from 'shared-data/products'
 import { cn } from 'ui'
@@ -54,7 +55,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/postgres-developers.tsx b/apps/www/data/solutions/postgres-developers.tsx
index f0c8b1d6e53..0cd374acaaf 100644
--- a/apps/www/data/solutions/postgres-developers.tsx
+++ b/apps/www/data/solutions/postgres-developers.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import {
   Check,
@@ -85,7 +86,7 @@ const data: () => {
       ctas: [
         {
           label: 'Start your project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/startups.tsx b/apps/www/data/solutions/startups.tsx
index 1106a1ed28b..7c08a8e5ee6 100644
--- a/apps/www/data/solutions/startups.tsx
+++ b/apps/www/data/solutions/startups.tsx
@@ -1,4 +1,5 @@
 import { CubeIcon } from '@heroicons/react/outline'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { useBreakpoint } from 'common'
 import {
   Check,
@@ -85,7 +86,7 @@ const data: () => {
       ctas: [
         {
           label: 'Get started with Supabase',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
           onClick: () =>
             sendTelemetryEvent({
diff --git a/apps/www/data/solutions/vibe-coders.tsx b/apps/www/data/solutions/vibe-coders.tsx
index aac037de93b..24d6c1b6f49 100644
--- a/apps/www/data/solutions/vibe-coders.tsx
+++ b/apps/www/data/solutions/vibe-coders.tsx
@@ -1,4 +1,5 @@
 import { useBreakpoint } from 'common'
+import { DASHBOARD_SIGN_UP_URL } from '@/lib/dashboard-links'
 import { Check, CheckCircle, Sparkles, Timer, Zap } from 'lucide-react'
 import dynamic from 'next/dynamic'
 import { PRODUCT_SHORTNAMES } from 'shared-data/products'
@@ -62,7 +63,7 @@ const useVibeCodersContent: () => {
       ctas: [
         {
           label: 'Start Your Project',
-          href: 'https://supabase.com/dashboard',
+          href: DASHBOARD_SIGN_UP_URL,
           type: 'primary' as any,
         },
       ],
diff --git a/apps/www/lib/dashboard-links.ts b/apps/www/lib/dashboard-links.ts
new file mode 100644
index 00000000000..f31852e4b99
--- /dev/null
+++ b/apps/www/lib/dashboard-links.ts
@@ -0,0 +1,16 @@
+export const DASHBOARD_URL = 'https://supabase.com/dashboard'
+export const DASHBOARD_SIGN_IN_URL = 'https://supabase.com/dashboard/sign-in'
+export const DASHBOARD_SIGN_UP_URL = 'https://supabase.com/dashboard/sign-up'
+
+/** Homepage/product "Start your project" CTA: sign-up for guests, dashboard for signed-in users. */
+export function getDashboardCtaHref(isLoggedIn: boolean): string {
+  return isLoggedIn ? DASHBOARD_URL : DASHBOARD_SIGN_UP_URL
+}
+
+const DASHBOARD_CTA_HREFS = new Set([DASHBOARD_URL, DASHBOARD_SIGN_UP_URL])
+
+/** Rewrite static dashboard/sign-up CTA hrefs when the visitor is already signed in. */
+export function resolveDashboardCtaHref(href: string, isLoggedIn: boolean): string {
+  if (!DASHBOARD_CTA_HREFS.has(href)) return href
+  return getDashboardCtaHref(isLoggedIn)
+}