diff --git a/apps/next/app/(authenticated)/guest/layout.tsx b/apps/next/app/(authenticated)/guest/layout.tsx
deleted file mode 100644
index a728084..0000000
--- a/apps/next/app/(authenticated)/guest/layout.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-export default function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <section className="mx-auto max-w-5xl space-y-6 py-6">
-      <header className="space-y-2">
-        <h2 className="text-4xl font-semibold tracking-tight lg:text-5xl">
-          Guest page
-        </h2>
-        <p>This is page accessible to guest accounts</p>
-      </header>
-      <div className="w-full">{children}</div>
-    </section>
-  )
-}
diff --git a/apps/next/app/(authenticated)/guest/page.tsx b/apps/next/app/(authenticated)/guest/page.tsx
deleted file mode 100644
index b74cc3d..0000000
--- a/apps/next/app/(authenticated)/guest/page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { redirect } from "next/navigation"
-
-import { GuestForm } from "@/components/user/guest-form"
-
-import { createClient } from "@/modules/utils/server"
-import { isAnonymousUser } from "@/modules/user/helpers"
-
-export default async function Page() {
-  const supabase = createClient()
-
-  const {
-    data: { user },
-  } = await supabase.auth.getUser()
-
-  if (!user || !isAnonymousUser(user)) {
-    redirect("/login")
-  }
-
-  return <GuestForm isAnonymousUser={user.is_anonymous ?? false} />
-}
diff --git a/apps/next/app/(authenticated)/bookmarks/layout.tsx b/apps/next/app/bookmarks/layout.tsx
similarity index 100%
rename from apps/next/app/(authenticated)/bookmarks/layout.tsx
rename to apps/next/app/bookmarks/layout.tsx
diff --git a/apps/next/app/(authenticated)/bookmarks/page.tsx b/apps/next/app/bookmarks/page.tsx
similarity index 100%
rename from apps/next/app/(authenticated)/bookmarks/page.tsx
rename to apps/next/app/bookmarks/page.tsx
diff --git a/apps/next/app/layout.tsx b/apps/next/app/layout.tsx
index 2d1a782..5d1ec35 100644
--- a/apps/next/app/layout.tsx
+++ b/apps/next/app/layout.tsx
@@ -9,6 +9,8 @@ import "./globals.css"
 
 import type { Viewport } from "next"
 
+import Navigation from "./navigation"
+
 const fontSans = FontSans({
   subsets: ["latin"],
   variable: "--font-sans",
@@ -27,7 +29,9 @@ export default function RootLayout({
           fontSans.variable
         )}
       >
-        <Providers>{children}</Providers>
+        <Providers>
+          <Navigation>{children}</Navigation>
+        </Providers>
       </body>
     </html>
   )
diff --git a/apps/next/app/login/new/page.tsx b/apps/next/app/login/new/page.tsx
index d642c98..05dc54a 100644
--- a/apps/next/app/login/new/page.tsx
+++ b/apps/next/app/login/new/page.tsx
@@ -12,7 +12,7 @@ export default async function Page() {
   } = await supabase.auth.getUser()
 
   if (user) {
-    user.is_anonymous ? redirect("/guest") : redirect("/settings/accounts")
+    redirect("/settings/accounts")
   }
 
   return <RegisterForm />
diff --git a/apps/next/app/login/new/passwordless/page.tsx b/apps/next/app/login/new/passwordless/page.tsx
index c48a957..1c5c96b 100644
--- a/apps/next/app/login/new/passwordless/page.tsx
+++ b/apps/next/app/login/new/passwordless/page.tsx
@@ -12,7 +12,7 @@ export default async function Page() {
   } = await supabase.auth.getUser()
 
   if (user) {
-    user.is_anonymous ? redirect("/guest") : redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   return <RegisterFormPasswordless />
diff --git a/apps/next/app/login/otp/confirm/page.tsx b/apps/next/app/login/otp/confirm/page.tsx
index a49261d..c18b3ea 100644
--- a/apps/next/app/login/otp/confirm/page.tsx
+++ b/apps/next/app/login/otp/confirm/page.tsx
@@ -21,7 +21,7 @@ export default async function Page({
   } = await supabase.auth.getUser()
 
   if (user) {
-    redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   if (!searchParams.email) {
diff --git a/apps/next/app/login/otp/page.tsx b/apps/next/app/login/otp/page.tsx
index 2ec9ca4..3cb78e8 100644
--- a/apps/next/app/login/otp/page.tsx
+++ b/apps/next/app/login/otp/page.tsx
@@ -12,7 +12,7 @@ export default async function Page() {
   } = await supabase.auth.getUser()
 
   if (user) {
-    redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   return <OtpLoginForm />
diff --git a/apps/next/app/login/page.tsx b/apps/next/app/login/page.tsx
index 2b1b463..d9b66d1 100644
--- a/apps/next/app/login/page.tsx
+++ b/apps/next/app/login/page.tsx
@@ -4,7 +4,6 @@ import { z } from "zod"
 import { LoginForm } from "@/components/user/login/login-form"
 
 import { createClient } from "@/modules/utils/server"
-import { isAnonymousUser } from "@/modules/user/helpers"
 
 export default async function Page({
   searchParams: { error },
@@ -18,7 +17,7 @@ export default async function Page({
   } = await supabase.auth.getUser()
 
   if (user) {
-    isAnonymousUser(user) ? redirect("/guest") : redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   if (error) {
diff --git a/apps/next/app/login/reset/page.tsx b/apps/next/app/login/reset/page.tsx
index 3f915e2..adc6913 100644
--- a/apps/next/app/login/reset/page.tsx
+++ b/apps/next/app/login/reset/page.tsx
@@ -12,7 +12,7 @@ export default async function Page() {
   } = await supabase.auth.getUser()
 
   if (user) {
-    redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   return <ResetPasswordForm />
diff --git a/apps/next/app/(authenticated)/layout.tsx b/apps/next/app/navigation.tsx
similarity index 62%
rename from apps/next/app/(authenticated)/layout.tsx
rename to apps/next/app/navigation.tsx
index 6d743fc..817ec1e 100644
--- a/apps/next/app/(authenticated)/layout.tsx
+++ b/apps/next/app/navigation.tsx
@@ -1,9 +1,8 @@
 import { ApplicationLayout } from "@/components/application-layout"
 
 import { createClient } from "@/modules/utils/server"
-import { isAnonymousUser } from "@/modules/user/helpers"
 
-export default async function Layout({
+export default async function Navigation({
   children,
 }: {
   children: React.ReactNode
@@ -14,11 +13,12 @@ export default async function Layout({
     data: { user },
   } = await supabase.auth.getUser()
 
+  if (!user) {
+    return <>{children}</>
+  }
+
   return (
-    <ApplicationLayout
-      userId={user?.id}
-      isAnonymousUser={!!user && isAnonymousUser(user)}
-    >
+    <ApplicationLayout userId={user.id} isAnonymousUser={user.is_anonymous}>
       {children}
     </ApplicationLayout>
   )
diff --git a/apps/next/app/page.tsx b/apps/next/app/page.tsx
index 516cefc..552b076 100644
--- a/apps/next/app/page.tsx
+++ b/apps/next/app/page.tsx
@@ -1,7 +1,6 @@
 import { redirect } from "next/navigation"
 
 import { createClient } from "@/modules/utils/server"
-import { isAnonymousUser } from "@/modules/user/helpers"
 
 export default async function Home() {
   const supabase = createClient()
@@ -11,7 +10,7 @@ export default async function Home() {
   } = await supabase.auth.getUser()
 
   if (user) {
-    isAnonymousUser(user) ? redirect("/guest") : redirect("/settings/accounts")
+    redirect("/settings")
   }
 
   redirect("/login")
diff --git a/apps/next/app/(authenticated)/settings/accounts/page.tsx b/apps/next/app/settings/accounts/page.tsx
similarity index 72%
rename from apps/next/app/(authenticated)/settings/accounts/page.tsx
rename to apps/next/app/settings/accounts/page.tsx
index 4f0ab31..c9ad024 100644
--- a/apps/next/app/(authenticated)/settings/accounts/page.tsx
+++ b/apps/next/app/settings/accounts/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation"
 
-import { Accounts } from "@/components/user/accounts"
+import { Accounts } from "@/components/user/settings/accounts"
 
 import { createClient } from "@/modules/utils/server"
 
@@ -15,5 +15,9 @@ export default async function Page() {
     redirect("/login")
   }
 
+  if (user.is_anonymous) {
+    redirect("/settings")
+  }
+
   return <Accounts userId={user.id} />
 }
diff --git a/apps/next/app/(authenticated)/settings/credentials/page.tsx b/apps/next/app/settings/credentials/page.tsx
similarity index 66%
rename from apps/next/app/(authenticated)/settings/credentials/page.tsx
rename to apps/next/app/settings/credentials/page.tsx
index f2d01e6..b53e0e5 100644
--- a/apps/next/app/(authenticated)/settings/credentials/page.tsx
+++ b/apps/next/app/settings/credentials/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation"
 
-import { CredentialsForm } from "@/components/user/credentials-form"
+import { CredentialsForm } from "@/components/user/settings/credentials-form"
 
 import { createClient } from "@/modules/utils/server"
 
@@ -11,9 +11,13 @@ export default async function Page() {
     data: { user },
   } = await supabase.auth.getUser()
 
-  if (!user?.email) {
+  if (!user) {
     redirect("/login")
   }
 
+  if (user.is_anonymous || !user.email) {
+    redirect("/settings")
+  }
+
   return <CredentialsForm userEmail={user.email} />
 }
diff --git a/apps/next/app/(authenticated)/settings/layout.tsx b/apps/next/app/settings/layout.tsx
similarity index 61%
rename from apps/next/app/(authenticated)/settings/layout.tsx
rename to apps/next/app/settings/layout.tsx
index ba48cde..f1406df 100644
--- a/apps/next/app/(authenticated)/settings/layout.tsx
+++ b/apps/next/app/settings/layout.tsx
@@ -1,17 +1,36 @@
 import { DynamicNavigationLinks } from "@/components/dynamic-navigation-links"
 
-export default function Layout({ children }: { children: React.ReactNode }) {
+import { createClient } from "@/modules/utils/server"
+
+export default async function Layout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  const supabase = createClient()
+
+  const {
+    data: { user },
+  } = await supabase.auth.getUser()
+
+  if (!user) return null
+
   return (
     <section className="mx-auto max-w-5xl space-y-6 py-6">
       <header className="space-y-2">
         <h2 className="text-4xl font-semibold tracking-tight lg:text-5xl">
-          Settings
+          {!user.is_anonymous ? "Settings" : "Guest Settings"}
         </h2>
-        <p>Manage your accounts, profile and credentials settings</p>
+        <p>
+          {!user.is_anonymous
+            ? "Manage your accounts, profile and credentials settings"
+            : "Access to settings is restricted to anonymous users"}
+        </p>
       </header>
       <div className="flex flex-col gap-6 lg:flex-row">
         <nav className="-ml-4 h-full min-w-[30%]">
           <DynamicNavigationLinks
+            isAnonymousUser={user.is_anonymous}
             items={[
               {
                 href: "/settings/accounts",
diff --git a/apps/next/app/(authenticated)/settings/page.tsx b/apps/next/app/settings/page.tsx
similarity index 71%
rename from apps/next/app/(authenticated)/settings/page.tsx
rename to apps/next/app/settings/page.tsx
index 5203615..7230b79 100644
--- a/apps/next/app/(authenticated)/settings/page.tsx
+++ b/apps/next/app/settings/page.tsx
@@ -1,5 +1,7 @@
 import { redirect } from "next/navigation"
 
+import { GuestForm } from "@/components/user/settings/guest-form"
+
 import { createClient } from "@/modules/utils/server"
 
 export default async function Page() {
@@ -13,5 +15,9 @@ export default async function Page() {
     redirect("/login")
   }
 
+  if (user.is_anonymous) {
+    return <GuestForm />
+  }
+
   redirect("/settings/accounts")
 }
diff --git a/apps/next/app/(authenticated)/settings/profile/page.tsx b/apps/next/app/settings/profile/page.tsx
similarity index 71%
rename from apps/next/app/(authenticated)/settings/profile/page.tsx
rename to apps/next/app/settings/profile/page.tsx
index 6fabb59..d404fa2 100644
--- a/apps/next/app/(authenticated)/settings/profile/page.tsx
+++ b/apps/next/app/settings/profile/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation"
 
-import { ProfileForm } from "@/components/user/profile-form"
+import { ProfileForm } from "@/components/user/settings/profile-form"
 
 import { createClient } from "@/modules/utils/server"
 
@@ -15,5 +15,9 @@ export default async function Page() {
     redirect("/login")
   }
 
+  if (user.is_anonymous) {
+    redirect("/settings")
+  }
+
   return <ProfileForm userId={user.id} />
 }
diff --git a/apps/next/components/application-layout.tsx b/apps/next/components/application-layout.tsx
index a99dd5f..4cb8866 100644
--- a/apps/next/components/application-layout.tsx
+++ b/apps/next/components/application-layout.tsx
@@ -3,7 +3,7 @@
 import * as React from "react"
 import Link from "next/link"
 import { usePathname } from "next/navigation"
-import { Bookmark, PanelLeft, Settings } from "lucide-react"
+import { Bookmark, PanelLeft } from "lucide-react"
 
 import {
   Breadcrumb,
@@ -63,20 +63,6 @@ export const ApplicationLayout: React.FC<
             <SupabaseModulesIcon />
             <span className="sr-only">Supabase Modules</span>
           </Link>
-          {!isAnonymousUser && (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Link
-                  href="/settings/accounts"
-                  className="flex size-9 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:text-foreground md:size-8"
-                >
-                  <Settings className="size-5" />
-                  <span className="sr-only">Settings</span>
-                </Link>
-              </TooltipTrigger>
-              <TooltipContent side="right">Settings</TooltipContent>
-            </Tooltip>
-          )}
           <Tooltip>
             <TooltipTrigger asChild>
               <Link
@@ -102,22 +88,10 @@ export const ApplicationLayout: React.FC<
             </SheetTrigger>
             <SheetContent side="left" className="sm:max-w-xs">
               <nav className="grid gap-6 text-lg font-medium">
-                <Link
-                  href="/"
-                  className="group flex size-9 shrink-0 items-center justify-center gap-2 rounded-full text-lg *:size-6 md:size-8 md:text-base"
-                >
+                <div className="group flex size-9 shrink-0 items-center justify-center gap-2 rounded-full text-lg *:size-6 md:size-8 md:text-base">
                   <SupabaseModulesIcon />
                   <span className="sr-only">Supabase Modules</span>
-                </Link>
-                <SheetClose asChild>
-                  <Link
-                    href={isAnonymousUser ? "/guest" : "/settings/accounts"}
-                    className="flex items-center gap-4 px-2.5 text-muted-foreground hover:text-foreground"
-                  >
-                    <Settings className="size-5" />
-                    Settings
-                  </Link>
-                </SheetClose>
+                </div>
                 <SheetClose asChild>
                   <Link
                     href="/bookmarks"
diff --git a/apps/next/components/bookmarks/bookmarks-list.tsx b/apps/next/components/bookmarks/bookmarks-list.tsx
index dd734b9..ca079c9 100644
--- a/apps/next/components/bookmarks/bookmarks-list.tsx
+++ b/apps/next/components/bookmarks/bookmarks-list.tsx
@@ -31,7 +31,7 @@ export const BookmarksList: React.FC<{ userId: string }> = ({ userId }) => {
     return (
       <div className="flex h-full flex-col items-center justify-center">
         <div className="animate-pulse">
-          <CircleIcon className="size-8 animate-spin inline" />
+          <CircleIcon className="inline size-8 animate-spin" />
         </div>
       </div>
     )
@@ -131,7 +131,7 @@ const BookmarkDelete: React.FC<{ bookmarkId: string; userId: string }> = ({
       size={"sm"}
       className="-ml-3 block"
     >
-      {isPending && <Loader2 className="mr-1.5 size-4 animate-spin inline" />}
+      {isPending && <Loader2 className="mr-1.5 inline size-4 animate-spin" />}
       Delete
     </Button>
   )
diff --git a/apps/next/components/bookmarks/create-bookmark.tsx b/apps/next/components/bookmarks/create-bookmark.tsx
index fcd7f04..066c1e5 100644
--- a/apps/next/components/bookmarks/create-bookmark.tsx
+++ b/apps/next/components/bookmarks/create-bookmark.tsx
@@ -88,7 +88,9 @@ const CreateBookmarkComponent: React.FC<{
           )}
         />
         <Button type="submit" disabled={isPending}>
-          {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
+          {isPending && (
+            <CircleIcon className="mr-2 inline size-4 animate-spin" />
+          )}
           Save
         </Button>
       </form>
diff --git a/apps/next/components/dynamic-navigation-links.tsx b/apps/next/components/dynamic-navigation-links.tsx
index f44f13d..04bc383 100644
--- a/apps/next/components/dynamic-navigation-links.tsx
+++ b/apps/next/components/dynamic-navigation-links.tsx
@@ -8,7 +8,8 @@ import { Button } from "@/components/ui/button"
 
 export const DynamicNavigationLinks: React.FC<{
   items: { href: string; label: string }[]
-}> = ({ items }) => {
+  isAnonymousUser?: boolean
+}> = ({ items, isAnonymousUser }) => {
   const pathname = usePathname()
 
   return (
@@ -17,7 +18,8 @@ export const DynamicNavigationLinks: React.FC<{
         <Button
           key={href}
           className="lg:w-full lg:justify-start"
-          asChild
+          asChild={!isAnonymousUser}
+          disabled={isAnonymousUser}
           variant="ghost"
         >
           {href === pathname ? (
diff --git a/apps/next/components/user/login/login-form.tsx b/apps/next/components/user/login/login-form.tsx
index efd23fc..8ea7575 100644
--- a/apps/next/components/user/login/login-form.tsx
+++ b/apps/next/components/user/login/login-form.tsx
@@ -52,7 +52,7 @@ export const LoginForm: React.FC<{
       email,
       password,
       redirect: {
-        url: "/settings/accounts",
+        url: "/settings",
       },
     })
   }
@@ -60,7 +60,7 @@ export const LoginForm: React.FC<{
   function handleAnonymousSignIn(): void {
     anonymousSignIn.mutate({
       redirect: {
-        url: "/guest",
+        url: "/settings",
       },
     })
   }
diff --git a/apps/next/components/user/profile-dropdown.tsx b/apps/next/components/user/profile-dropdown.tsx
index 2e07f06..46b868c 100644
--- a/apps/next/components/user/profile-dropdown.tsx
+++ b/apps/next/components/user/profile-dropdown.tsx
@@ -26,7 +26,7 @@ import { AvatarPlaceholder } from "@/components/avatar-placeholder"
 import { signOut } from "@/modules/user/auth"
 import { getProfile } from "@/modules/user/profile"
 
-const DEFAULT_HUE = 0
+const DEFAULT_HUE = 100
 
 export const ProfileDropdown: React.FC<{
   userId: string
@@ -89,20 +89,16 @@ export const ProfileDropdown: React.FC<{
             {profile?.data?.username ?? "Guest"}
           </DropdownMenuLabel>
           <DropdownMenuSeparator />
-          {!isAnonymousUser && (
-            <>
-              <DropdownMenuItem asChild>
-                <Link href="/settings/accounts">Accounts</Link>
-              </DropdownMenuItem>
-              <DropdownMenuItem asChild>
-                <Link href="/settings/profile">Profile</Link>
-              </DropdownMenuItem>
-              <DropdownMenuItem asChild>
-                <Link href="/settings/credentials">Credentials</Link>
-              </DropdownMenuItem>
-              <DropdownMenuSeparator />
-            </>
-          )}
+          <DropdownMenuItem disabled={isAnonymousUser} asChild>
+            <Link href="/settings/accounts">Accounts</Link>
+          </DropdownMenuItem>
+          <DropdownMenuItem disabled={isAnonymousUser} asChild>
+            <Link href="/settings/profile">Profile</Link>
+          </DropdownMenuItem>
+          <DropdownMenuItem disabled={isAnonymousUser} asChild>
+            <Link href="/settings/credentials">Credentials</Link>
+          </DropdownMenuItem>
+          <DropdownMenuSeparator />
           <DropdownMenuItem onClick={() => handleSignOut()}>
             Logout
           </DropdownMenuItem>
@@ -118,7 +114,7 @@ export const ProfileDropdown: React.FC<{
           <DialogFooter>
             <DialogClose asChild>
               <Button asChild>
-                <Link href="/guest">Finish registration</Link>
+                <Link href="/settings">Finish registration</Link>
               </Button>
             </DialogClose>
             <Button
diff --git a/apps/next/components/user/accounts.tsx b/apps/next/components/user/settings/accounts.tsx
similarity index 97%
rename from apps/next/components/user/accounts.tsx
rename to apps/next/components/user/settings/accounts.tsx
index 615a32d..0af1d71 100644
--- a/apps/next/components/user/accounts.tsx
+++ b/apps/next/components/user/settings/accounts.tsx
@@ -145,7 +145,9 @@ const AccountsComponent: React.FC<{
               variant="secondary"
               className="hidden px-3 shadow-none sm:block"
             >
-              {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
+              {isPending && (
+                <CircleIcon className="mr-2 inline size-4 animate-spin" />
+              )}
               Sign out
             </Button>
             <Separator
diff --git a/apps/next/components/user/credentials-form.tsx b/apps/next/components/user/settings/credentials-form.tsx
similarity index 97%
rename from apps/next/components/user/credentials-form.tsx
rename to apps/next/components/user/settings/credentials-form.tsx
index 7b7fc98..9990c31 100644
--- a/apps/next/components/user/credentials-form.tsx
+++ b/apps/next/components/user/settings/credentials-form.tsx
@@ -196,7 +196,9 @@ const CredentialsFormComponent: React.FC<{
               </Alert>
             )}
             <Button type="submit" disabled={isPending}>
-              {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
+              {isPending && (
+                <CircleIcon className="mr-2 inline size-4 animate-spin" />
+              )}
               Update Settings
             </Button>
           </form>
diff --git a/apps/next/components/user/guest-form.tsx b/apps/next/components/user/settings/guest-form.tsx
similarity index 54%
rename from apps/next/components/user/guest-form.tsx
rename to apps/next/components/user/settings/guest-form.tsx
index 7ee826a..2032a26 100644
--- a/apps/next/components/user/guest-form.tsx
+++ b/apps/next/components/user/settings/guest-form.tsx
@@ -30,9 +30,7 @@ import { Input } from "@/components/ui/input"
 
 import { updateUser } from "@/modules/user/auth"
 
-export const GuestForm: React.FC<{
-  isAnonymousUser: boolean
-}> = ({ isAnonymousUser }) => {
+export const GuestForm: React.FC = () => {
   const finishSignUp = useMutation({
     mutationFn: updateUser,
     onSuccess: (data, vars) => {
@@ -43,23 +41,9 @@ export const GuestForm: React.FC<{
     },
   })
 
-  if (isAnonymousUser)
-    return (
-      <GuestFormNotRegistered
-        finishSignUp={({ email }) =>
-          finishSignUp.mutate({ email, data: { hasPassword: false } })
-        }
-        isPending={finishSignUp.isPending}
-        isError={!!finishSignUp.data?.error}
-        errorMessage={finishSignUp.data?.error.message}
-      />
-    )
-
   return (
-    <GuestFormNoPassword
-      finishSignUp={({ password }) =>
-        finishSignUp.mutate({ password, data: { hasPassword: true } })
-      }
+    <GuestFormNotRegistered
+      finishSignUp={({ email }) => finishSignUp.mutate({ email })}
       isPending={finishSignUp.isPending}
       isError={!!finishSignUp.data?.error}
       errorMessage={finishSignUp.data?.error.message}
@@ -112,76 +96,9 @@ const GuestFormNotRegistered: React.FC<{
                   <FormControl>
                     <Input placeholder="sosa@webscope.io" {...field} />
                   </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            {isError && (
-              <Alert variant="destructive">
-                <CrossCircledIcon className="size-4" />
-                <AlertTitle>Something went wrong!</AlertTitle>
-                <AlertDescription>
-                  {errorMessage ?? "Unknown error"}
-                </AlertDescription>
-              </Alert>
-            )}
-            <Button type="submit" disabled={isPending}>
-              {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
-              Create account
-            </Button>
-          </form>
-        </Form>
-      </CardContent>
-    </Card>
-  )
-}
-
-const NoPasswordFormSchema = z.object({
-  password: z.string().min(6, "Password must be at least 6 characters"),
-})
-
-const GuestFormNoPassword: React.FC<{
-  finishSignUp: ({ password }: { password: string }) => void
-  isPending: boolean
-  isError: boolean
-  errorMessage?: string
-}> = ({ finishSignUp, isError, isPending, errorMessage }) => {
-  const form = useForm<z.infer<typeof NoPasswordFormSchema>>({
-    resolver: zodResolver(NoPasswordFormSchema),
-    defaultValues: {
-      password: "",
-    },
-  })
-
-  return (
-    <Card>
-      <CardHeader>
-        <CardTitle>Set up a password</CardTitle>
-        <CardDescription>
-          You need to create a password to finish sign up process.
-        </CardDescription>
-      </CardHeader>
-      <CardContent>
-        <Form {...form}>
-          <form
-            onSubmit={form.handleSubmit(({ password }) => {
-              finishSignUp({
-                password,
-              })
-            })}
-            className="space-y-6"
-          >
-            <FormField
-              control={form.control}
-              name="password"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Password</FormLabel>
-                  <FormControl>
-                    <Input type="password" placeholder="Password" {...field} />
-                  </FormControl>
                   <FormDescription>
-                    The new password you would like to use
+                    Once you&apos;ve confirmed your email, you&apos;ll need to
+                    set a password as well via <b>Setttings — Credentials</b>.
                   </FormDescription>
                   <FormMessage />
                 </FormItem>
@@ -197,8 +114,10 @@ const GuestFormNoPassword: React.FC<{
               </Alert>
             )}
             <Button type="submit" disabled={isPending}>
-              {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
-              Set password
+              {isPending && (
+                <CircleIcon className="mr-2 inline size-4 animate-spin" />
+              )}
+              Create account
             </Button>
           </form>
         </Form>
diff --git a/apps/next/components/user/profile-form.tsx b/apps/next/components/user/settings/profile-form.tsx
similarity index 98%
rename from apps/next/components/user/profile-form.tsx
rename to apps/next/components/user/settings/profile-form.tsx
index 057b6db..9179f63 100644
--- a/apps/next/components/user/profile-form.tsx
+++ b/apps/next/components/user/settings/profile-form.tsx
@@ -251,7 +251,9 @@ const ProfileFormComponent: React.FC<{
               </Alert>
             )}
             <Button type="submit" disabled={isPending}>
-              {isPending && <CircleIcon className="mr-2 size-4 animate-spin inline" />}
+              {isPending && (
+                <CircleIcon className="mr-2 inline size-4 animate-spin" />
+              )}
               Update Settings
             </Button>
           </form>
diff --git a/apps/next/emails/email_change.tsx b/apps/next/emails/email_change.tsx
index fae377d..ce56173 100644
--- a/apps/next/emails/email_change.tsx
+++ b/apps/next/emails/email_change.tsx
@@ -25,13 +25,20 @@ export default function Email() {
   return (
     <Html>
       <Head />
-      <Preview>Configm email change</Preview>
+      <Preview>Confirm email</Preview>
       <Body style={styles.main}>
         <Container style={styles.container}>
-          <Heading style={styles.h1}>Confirm email change</Heading>
-          <Text
-            style={styles.text}
-          >{`Click below to confirm the update of your email from {{ .Email }} to {{ .NewEmail }}:`}</Text>
+          <Heading style={styles.h1}>Confirm email</Heading>
+          {`{{ if .Email }}`}
+          <Text style={styles.text}>
+            Click below to confirm the update of your email from{" "}
+            {`{{ .Email }}`} to {`{{ .NewEmail }}`}:
+          </Text>
+          {`{{ else }}`}
+          <Text style={styles.text}>
+            Click below to confirm your email to {`{{ .NewEmail }}`}:
+          </Text>
+          {`{{ end }}`}
           <Section style={styles.buttonContainer}>
             <Button style={styles.button} href={confirmationURL}>
               Click here to confirm
diff --git a/apps/next/modules/user/helpers.ts b/apps/next/modules/user/helpers.ts
deleted file mode 100644
index 388bd8e..0000000
--- a/apps/next/modules/user/helpers.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { User } from "@supabase/supabase-js"
-import { z } from "zod"
-
-export const UserMetadataSchema = z.object({
-  hasPassword: z.boolean().default(true),
-})
-
-export function isAnonymousUser(user: User) {
-  const userMetadata = UserMetadataSchema.parse(user?.user_metadata)
-
-  return user.is_anonymous || !userMetadata.hasPassword
-}
diff --git a/apps/next/supabase/templates/email_change.html b/apps/next/supabase/templates/email_change.html
index 416a211..5a1fd51 100644
--- a/apps/next/supabase/templates/email_change.html
+++ b/apps/next/supabase/templates/email_change.html
@@ -4,7 +4,7 @@
   <head>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
   </head>
-  <div style="display:none;overflow:hidden;line-height:1px;opacity:0;max-height:0;max-width:0">Configm email change<div> ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏</div>
+  <div style="display:none;overflow:hidden;line-height:1px;opacity:0;max-height:0;max-width:0">Confirm email<div> ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏ ‌​‍‎‏</div>
   </div>
 
   <body style="background-color:#ffffff;font-family:-apple-system,BlinkMacSystemFont,&quot;Segoe UI&quot;,Roboto,Oxygen-Sans,Ubuntu,Cantarell,&quot;Helvetica Neue&quot;,sans-serif">
@@ -12,8 +12,9 @@
       <tbody>
         <tr style="width:100%">
           <td>
-            <h1 style="color:#09090B;font-size:24px;font-weight:bold;margin:40px 0 16px;padding:0">Confirm email change</h1>
-            <p style="font-size:14px;line-height:24px;margin:16px 0;color:#09090B">Click below to confirm the update of your email from {{ .Email }} to {{ .NewEmail }}:</p>
+            <h1 style="color:#09090B;font-size:24px;font-weight:bold;margin:40px 0 16px;padding:0">Confirm email</h1>{{ if .Email }}
+            <p style="font-size:14px;line-height:24px;margin:16px 0;color:#09090B">Click below to confirm the update of your email from {{ .Email }} to {{ .NewEmail }}:</p>{{ else }}
+            <p style="font-size:14px;line-height:24px;margin:16px 0;color:#09090B">Click below to confirm your email to {{ .NewEmail }}:</p>{{ end }}
             <table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center">
               <tbody>
                 <tr>