diff --git a/src/lib/components/MagicLink.svelte b/src/lib/components/MagicLink.svelte
new file mode 100644
index 0000000..dda34f4
--- /dev/null
+++ b/src/lib/components/MagicLink.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+import { Auth } from '@supabase/auth-ui-svelte'
+import { ThemeSupa } from '@supabase/auth-ui-shared'
+
+export let supabase: any;
+export let url: string;
+
+</script>
+
+<div class="p-4">
+  <Auth
+      supabaseClient={supabase}
+      view="magic_link"
+      redirectTo={`${url}/auth/callback`}
+      showLinks={false}
+      appearance={{ theme: ThemeSupa, style: { input: 'color: #fff' } }}
+      additionalData={{}}
+    />
+</div>
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 627835a..2399c15 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -5,14 +5,14 @@
 	import { basket, type Basket, type Item } from '$lib/stores/basket.js';
 	import { general } from '$lib/stores/generalStore.js';
 	import { invalidate } from '$app/navigation';
-	import SignIn from '$lib/components/SignIn.svelte';
 	import SignOut from '$lib/components/SignOut.svelte';
 	import CookieConsent from '$lib/components/CookieConsent.svelte';
 	import NavLinks from '$lib/components/NavLinks.svelte';
+	import MagicLink from '$lib/components/MagicLink.svelte';
 
 	export let data;
-	let { supabase, session } = data;
-	$: ({ supabase, session } = data);
+	let { supabase, session, url } = data;
+	$: ({ supabase, session, url } = data);
 
 	let localBasket: Basket;
 	const unsubscribeToBasket = basket.subscribe((value) => {
@@ -113,8 +113,8 @@
 					<span class="badge badge-sm indicator-item">{localBasket.items.length}</span>
 				</div>
 			</a>
-			<div class="dropdown dropdown-end">
-				<div tabindex="0" role="button" class="btn btn-ghost btn-circle avatar">
+			<details class="dropdown dropdown-end">
+				<summary tabindex="0" role="button" class="btn btn-ghost btn-circle avatar">
 					<div class="w-10 rounded-full">
 						{#if session?.user}
 							<div class="user-circle text-primary-content border-primary-content">
@@ -130,7 +130,7 @@
 							</svg>
 						{/if}
 					</div>
-				</div>
+				</summary>
 
 				{#if session?.user}
 					<ul
@@ -147,10 +147,10 @@
 					<div
 						class="mt-3 z-[1] p-2 shadow menu menu-sm dropdown-content bg-base-100 text-base-content rounded-box min-w-[13rem] w-auto"
 					>
-						<SignIn {supabase} />
+						<MagicLink {supabase} {url} />
 					</div>
 				{/if}
-			</div>
+			</details>
 		</div>
 	</nav>
 </header>
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 37bbb09..7a3ea7a 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -2,7 +2,7 @@ import { createBrowserClient, createServerClient, isBrowser } from '@supabase/ss
 import { PUBLIC_SUPABASE_ANON_KEY, PUBLIC_SUPABASE_URL } from '$env/static/public';
 import type { LayoutLoad } from './$types';
 
-export const load: LayoutLoad = async ({ fetch, data, depends }) => {
+export const load: LayoutLoad = async ({ fetch, data, depends, url }) => {
 	depends('supabase:auth');
 
 	const supabase = isBrowser()
@@ -31,5 +31,5 @@ export const load: LayoutLoad = async ({ fetch, data, depends }) => {
 		data: { session }
 	} = await supabase.auth.getSession();
 
-	return { supabase, session };
+	return { supabase, session, url: url.origin };
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index f0db6cd..2047ba0 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import SignUp from '$lib/components/SignUp.svelte';
+	import MagicLink from '$lib/components/MagicLink.svelte';
 
 	export let data;
-	let { supabase, session } = data;
-	$: ({ supabase, session } = data);
+	let { supabase, session, url } = data;
+	$: ({ supabase, session, url } = data);
 </script>
 
 {#if session !== null}
@@ -19,7 +19,7 @@
 				</h1>
 			</div>
 			<div id="sign-up" class="card shrink-0 w-full max-w-sm shadow-2xl">
-				<SignUp {supabase} />
+				<MagicLink {supabase} {url} />
 			</div>
 		</div>
 	</div>
diff --git a/src/routes/account/+page.server.ts b/src/routes/account/+page.server.ts
index f2a414a..d839775 100644
--- a/src/routes/account/+page.server.ts
+++ b/src/routes/account/+page.server.ts
@@ -8,41 +8,39 @@ export const load: PageServerLoad = async ({ locals: { supabase, safeGetSession
 		redirect(303, '/');
 	}
 
-	const { data: profile } = await supabase
-		.from('profiles')
-		.select(`username, full_name`)
+	const { data: user } = await supabase
+		.from('users')
+		.select(`name`)
 		.eq('id', session.user.id)
 		.single();
 
-	return { session, profile };
+	return { session, user };
 };
 
 export const actions: Actions = {
 	update: async ({ request, locals: { supabase, safeGetSession } }) => {
 		const formData = await request.formData();
-		const fullName = formData.get('fullName') as string;
+		const name = formData.get('name') as string;
 
 		const { session } = await safeGetSession();
 
-		const { error } = await supabase.from('profiles').upsert({
-			id: session?.user.id,
-			full_name: fullName,
-			username: session?.user.email,
-			updated_at: new Date()
-		});
+		if (!session) {
+			return fail(401, { name });
+		}
+		const { error } = await supabase.from('users').update({
+			name: name,
+		}).eq('id', session?.user.id);
 
 		console.error(error);
 
 		if (error) {
 			return fail(500, {
-				fullName,
-				username: session?.user.email
+				name,
 			});
 		}
 
 		return {
-			fullName,
-			username: session?.user.email
+			name,
 		};
 	},
 	signout: async ({ locals: { supabase, safeGetSession } }) => {
diff --git a/src/routes/account/+page.svelte b/src/routes/account/+page.svelte
index 5e26972..d133724 100644
--- a/src/routes/account/+page.svelte
+++ b/src/routes/account/+page.svelte
@@ -5,12 +5,12 @@
 	export let data;
 	export let form;
 
-	let { session, supabase, profile } = data;
-	$: ({ session, supabase, profile } = data);
+	let { session, supabase, user } = data;
+	$: ({ session, supabase, user } = data);
 
 	let profileForm: HTMLFormElement;
 	let loading = false;
-	let fullName: string = profile?.full_name ?? '';
+	let name: string = user?.name ?? '';
 
 	const handleSubmit: SubmitFunction = () => {
 		loading = true;
@@ -37,13 +37,8 @@
 		bind:this={profileForm}
 	>
 		<div>
-			<label for="email">Username</label>
-			<input id="email" type="text" value={session.user.email} disabled />
-		</div>
-
-		<div>
-			<label for="fullName">Full Name</label>
-			<input id="fullName" name="fullName" type="text" value={form?.fullName ?? fullName} />
+			<label for="name">Name</label>
+			<input id="name" name="name" type="text" value={form?.name ?? name} />
 		</div>
 
 		<div>
diff --git a/src/routes/auth/callback/+server.ts b/src/routes/auth/callback/+server.ts
new file mode 100644
index 0000000..5f160a7
--- /dev/null
+++ b/src/routes/auth/callback/+server.ts
@@ -0,0 +1,14 @@
+import { redirect, type RequestHandler } from '@sveltejs/kit'
+
+export const GET: RequestHandler = async (event) => {
+  const { url, locals: { supabase } } = event;
+  const code = url.searchParams.get('code')
+
+  if (code) {
+    await supabase.auth.exchangeCodeForSession(code)
+  }
+
+  // TODO: Create stripe customer and sync with supabase user
+
+  throw redirect(303, '/account')
+}