diff --git a/apps/dashboard/src/app/(auth)/login/[[...login]]/page.tsx b/apps/dashboard/src/app/(auth)/login/[[...login]]/page.tsx
new file mode 100644
index 00000000..33d59d16
--- /dev/null
+++ b/apps/dashboard/src/app/(auth)/login/[[...login]]/page.tsx
@@ -0,0 +1,9 @@
+import { SignIn } from '@clerk/nextjs';
+
+export default function Page() {
+  return (
+    <div className="flex min-h-screen items-center justify-center p-4">
+      <SignIn signUpUrl="/register" />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(auth)/login/email-sign-in.tsx b/apps/dashboard/src/app/(auth)/login/email-sign-in.tsx
deleted file mode 100644
index 3b9a18d5..00000000
--- a/apps/dashboard/src/app/(auth)/login/email-sign-in.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { useEffect } from 'react';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { getClerkError } from '@/utils/clerk-error';
-import { useSignIn } from '@clerk/nextjs';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useRouter } from 'next/navigation';
-import { useForm } from 'react-hook-form';
-import { toast } from 'sonner';
-import { z } from 'zod';
-
-const validator = z.object({
-  email: z.string().email(),
-  password: z.string().min(8),
-});
-
-type IForm = z.infer<typeof validator>;
-
-const EmailSignUp = () => {
-  const router = useRouter();
-  const { isLoaded, signIn, setActive } = useSignIn();
-
-  const form = useForm<IForm>({
-    resolver: zodResolver(validator),
-  });
-
-  useEffect(() => {
-    if (form.formState.errors.email?.message) {
-      toast.error(`Email: ${form.formState.errors.email?.message}`);
-    }
-  }, [form.formState.errors.email?.message]);
-
-  useEffect(() => {
-    if (form.formState.errors.password?.message) {
-      toast.error(`Password: ${form.formState.errors.password?.message}`);
-    }
-  }, [form.formState.errors.password?.message]);
-
-  return (
-    <form
-      className="flex flex-col gap-2"
-      onSubmit={form.handleSubmit(async (values) => {
-        if (!isLoaded) {
-          return toast.error('Sign in is not ready yet, please try again.');
-        }
-
-        try {
-          const result = await signIn.create({
-            identifier: values.email,
-            password: values.password,
-          });
-
-          if (result.status === 'complete') {
-            await setActive({ session: result.createdSessionId });
-            router.push('/');
-          } else {
-            // Error...
-          }
-        } catch (e) {
-          const error = getClerkError(e);
-          if (error?.message) {
-            toast.error(error.message);
-          }
-        }
-      })}
-    >
-      <Input
-        type="email"
-        placeholder="Email"
-        {...form.register('email')}
-        error={form.formState.errors.email?.message}
-      />
-      <Input
-        type="password"
-        placeholder="Password"
-        {...form.register('password')}
-        error={form.formState.errors.password?.message}
-      />
-      <Button type="submit">Sign in</Button>
-    </form>
-  );
-};
-
-export default EmailSignUp;
diff --git a/apps/dashboard/src/app/(auth)/login/page.client.tsx b/apps/dashboard/src/app/(auth)/login/page.client.tsx
deleted file mode 100644
index d5ba9c65..00000000
--- a/apps/dashboard/src/app/(auth)/login/page.client.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client';
-
-import type { OAuthStrategy } from '@/types';
-import { useSignIn } from '@clerk/nextjs';
-import { toast } from 'sonner';
-
-import EmailSignUp from './email-sign-in';
-
-const PageClient = () => {
-  const { signIn } = useSignIn();
-
-  const signInWith = (strategy: OAuthStrategy) => {
-    if (!signIn) {
-      return toast.error('Sign in is not available at the moment');
-    }
-    return signIn.authenticateWithRedirect({
-      strategy,
-      redirectUrl: '/sso-callback',
-      redirectUrlComplete: '/',
-    });
-  };
-
-  return (
-    <div className="flex min-h-screen items-center justify-center p-4">
-      <div className="card w-full p-8 md:max-w-sm">
-        <div className="mb-8 text-2xl font-bold">Sign in</div>
-        <div className="flex flex-col gap-4">
-          <button
-            onClick={() => signInWith('oauth_google')}
-            type="button"
-            className="group flex h-10 w-full items-center justify-center space-x-2 rounded-md border border-gray-200 bg-white px-4 text-sm text-gray-600 transition-all hover:bg-gray-100"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              className="h-4 w-4"
-            >
-              <path
-                d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-                fill="#4285F4"
-              ></path>
-              <path
-                d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-                fill="#34A853"
-              ></path>
-              <path
-                d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-                fill="#FBBC05"
-              ></path>
-              <path
-                d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-                fill="#EA4335"
-              ></path>
-              <path d="M1 1h22v22H1z" fill="none"></path>
-            </svg>
-            <p className="">Continue with Google</p>
-          </button>
-          <button
-            onClick={() => signInWith('oauth_github')}
-            type="button"
-            className="group flex h-10 w-full items-center justify-center space-x-2 rounded-md border border-black bg-black px-4 text-sm text-white transition-all hover:bg-black/70"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20"
-              height="20"
-              fill="currentColor"
-              viewBox="0 0 24 24"
-              className="h-4 w-4"
-            >
-              <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"></path>
-            </svg>
-            <p className="">Continue with GitHub</p>
-          </button>
-          <div className="relative flex justify-center">
-            <div className="absolute top-2.5 h-px w-full bg-border"></div>
-            <div className="relative bg-background px-4 text-center text-sm text-gray-500">
-              or with email
-            </div>
-          </div>
-          <EmailSignUp />
-          <p className="text-sm text-gray-500">
-            No account?{' '}
-            <a
-              className="font-semibold text-gray-500 underline transition-colors hover:text-black"
-              href="/register"
-            >
-              Create one now
-            </a>
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default PageClient;
diff --git a/apps/dashboard/src/app/(auth)/login/page.tsx b/apps/dashboard/src/app/(auth)/login/page.tsx
deleted file mode 100644
index 1b9019ad..00000000
--- a/apps/dashboard/src/app/(auth)/login/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { auth } from '@clerk/nextjs/server';
-import { redirect } from 'next/navigation';
-
-import PageClient from './page.client';
-
-export const dynamic = 'force-dynamic';
-
-// Sign up
-const Page = () => {
-  const session = auth();
-  if (session.userId) {
-    return redirect('/');
-  }
-  return <PageClient />;
-};
-
-export default Page;
diff --git a/apps/dashboard/src/app/(auth)/register/[[...register]]/page.tsx b/apps/dashboard/src/app/(auth)/register/[[...register]]/page.tsx
new file mode 100644
index 00000000..0bb2fa30
--- /dev/null
+++ b/apps/dashboard/src/app/(auth)/register/[[...register]]/page.tsx
@@ -0,0 +1,9 @@
+import { SignUp } from '@clerk/nextjs';
+
+export default function Page() {
+  return (
+    <div className="flex min-h-screen items-center justify-center p-4">
+      <SignUp signInUrl="/register" />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(auth)/register/email-sign-up.tsx b/apps/dashboard/src/app/(auth)/register/email-sign-up.tsx
deleted file mode 100644
index 3d5653f8..00000000
--- a/apps/dashboard/src/app/(auth)/register/email-sign-up.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useEffect } from 'react';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { pushModal } from '@/modals';
-import { getClerkError } from '@/utils/clerk-error';
-import { useSignUp } from '@clerk/nextjs';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { toast } from 'sonner';
-import { z } from 'zod';
-
-const validator = z.object({
-  email: z.string().email(),
-  password: z.string().min(8),
-});
-
-type IForm = z.infer<typeof validator>;
-
-const EmailSignUp = () => {
-  const { isLoaded, signUp } = useSignUp();
-
-  const form = useForm<IForm>({
-    resolver: zodResolver(validator),
-  });
-
-  useEffect(() => {
-    if (form.formState.errors.email?.message) {
-      toast.error(`Email: ${form.formState.errors.email?.message}`);
-    }
-  }, [form.formState.errors.email?.message]);
-
-  useEffect(() => {
-    if (form.formState.errors.password?.message) {
-      toast.error(`Password: ${form.formState.errors.password?.message}`);
-    }
-  }, [form.formState.errors.password?.message]);
-
-  return (
-    <form
-      className="flex flex-col gap-2"
-      onSubmit={form.handleSubmit(async (values) => {
-        if (!isLoaded) {
-          return toast.error('Sign up is not ready yet, please try again.');
-        }
-
-        try {
-          await signUp.create({
-            emailAddress: values.email,
-            password: values.password,
-          });
-
-          // Send the user an email with the verification code
-          await signUp.prepareEmailAddressVerification({
-            strategy: 'email_code',
-          });
-
-          pushModal('VerifyEmail', {
-            email: values.email,
-          });
-        } catch (e) {
-          const error = getClerkError(e);
-          if (error?.message) {
-            toast.error(error.message);
-          }
-        }
-      })}
-    >
-      <Input
-        type="email"
-        placeholder="Email"
-        {...form.register('email')}
-        error={form.formState.errors.email?.message}
-      />
-      <Input
-        type="password"
-        placeholder="Password"
-        {...form.register('password')}
-        error={form.formState.errors.password?.message}
-      />
-      <Button type="submit">Create account</Button>
-    </form>
-  );
-};
-
-export default EmailSignUp;
diff --git a/apps/dashboard/src/app/(auth)/register/page.client.tsx b/apps/dashboard/src/app/(auth)/register/page.client.tsx
deleted file mode 100644
index 6239db2e..00000000
--- a/apps/dashboard/src/app/(auth)/register/page.client.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client';
-
-import type { OAuthStrategy } from '@/types';
-import { useSignUp } from '@clerk/nextjs';
-import { toast } from 'sonner';
-
-import EmailSignUp from './email-sign-up';
-
-const PageClient = () => {
-  const { signUp } = useSignUp();
-
-  const signInWith = (strategy: OAuthStrategy) => {
-    if (!signUp) {
-      return toast.error('Sign in is not available at the moment');
-    }
-    return signUp.authenticateWithRedirect({
-      strategy,
-      redirectUrl: '/sso-callback',
-      redirectUrlComplete: '/',
-    });
-  };
-
-  return (
-    <div className="flex min-h-screen items-center justify-center p-4">
-      <div className="card w-full p-8 md:max-w-sm">
-        <div className="mb-8 text-2xl font-bold">Create an account</div>
-        <div className="flex flex-col gap-4">
-          <button
-            onClick={() => signInWith('oauth_google')}
-            type="button"
-            className="group flex h-10 w-full items-center justify-center space-x-2 rounded-md border border-gray-200 bg-white px-4 text-sm text-gray-600 transition-all hover:bg-gray-100"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              className="h-4 w-4"
-            >
-              <path
-                d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-                fill="#4285F4"
-              ></path>
-              <path
-                d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-                fill="#34A853"
-              ></path>
-              <path
-                d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-                fill="#FBBC05"
-              ></path>
-              <path
-                d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-                fill="#EA4335"
-              ></path>
-              <path d="M1 1h22v22H1z" fill="none"></path>
-            </svg>
-            <p className="">Continue with Google</p>
-          </button>
-          <button
-            onClick={() => signInWith('oauth_github')}
-            type="button"
-            className="group flex h-10 w-full items-center justify-center space-x-2 rounded-md border border-black bg-black px-4 text-sm text-white transition-all hover:bg-black/70"
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20"
-              height="20"
-              fill="currentColor"
-              viewBox="0 0 24 24"
-              className="h-4 w-4"
-            >
-              <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"></path>
-            </svg>
-            <p className="">Continue with GitHub</p>
-          </button>
-          <div className="relative flex justify-center">
-            <div className="absolute top-2.5 h-px w-full bg-border"></div>
-            <div className="relative bg-background px-4 text-center text-sm text-gray-500">
-              or with email
-            </div>
-          </div>
-          <EmailSignUp />
-          <p className="text-sm text-gray-500">
-            Already have an account?{' '}
-            <a
-              className="font-semibold text-gray-500 transition-colors hover:text-black"
-              href="/login"
-            >
-              Sign in
-            </a>
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default PageClient;
diff --git a/apps/dashboard/src/app/(auth)/register/page.tsx b/apps/dashboard/src/app/(auth)/register/page.tsx
deleted file mode 100644
index 1b9019ad..00000000
--- a/apps/dashboard/src/app/(auth)/register/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { auth } from '@clerk/nextjs/server';
-import { redirect } from 'next/navigation';
-
-import PageClient from './page.client';
-
-export const dynamic = 'force-dynamic';
-
-// Sign up
-const Page = () => {
-  const session = auth();
-  if (session.userId) {
-    return redirect('/');
-  }
-  return <PageClient />;
-};
-
-export default Page;
diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.ts
index df7f338e..44ac1780 100644
--- a/apps/dashboard/src/middleware.ts
+++ b/apps/dashboard/src/middleware.ts
@@ -6,8 +6,8 @@ import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
 const isPublicRoute = createRouteMatcher([
   '/share/overview/:id',
   '/api/clerk/(.*)?',
-  '/login',
-  '/register',
+  '/login(.*)?',
+  '/register(.*)?',
   '/sso-callback(.*)?',
 ]);