diff --git a/app/auth/login/page.tsx b/app/auth/login/page.tsx
index 2c95e9d..452a0fa 100644
--- a/app/auth/login/page.tsx
+++ b/app/auth/login/page.tsx
@@ -7,7 +7,8 @@ import { Label } from '@/components/ui/label'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { useState } from 'react'
-import { Mail, Lock, Loader2, ArrowLeft } from 'lucide-react'
+import { Mail, Lock, Loader2, ArrowLeft, Key } from 'lucide-react'
+import { isPasskeySupported, authenticateWithPasskey } from '@/lib/passkeys'
 
 export default function LoginPage() {
   const [email, setEmail] = useState('')
@@ -15,6 +16,8 @@ export default function LoginPage() {
   const [error, setError] = useState<string | null>(null)
   const [isLoading, setIsLoading] = useState(false)
   const [isGoogleLoading, setIsGoogleLoading] = useState(false)
+  const [isPasskeyLoading, setIsPasskeyLoading] = useState(false)
+  const [passkeySupported] = useState(() => isPasskeySupported())
   const router = useRouter()
 
   const handleLogin = async (e: React.FormEvent) => {
@@ -56,6 +59,33 @@ export default function LoginPage() {
     }
   }
 
+  const handlePasskeyLogin = async () => {
+    const supabase = createClient()
+    setIsPasskeyLoading(true)
+    setError(null)
+
+    try {
+      const credential = await authenticateWithPasskey()
+      
+      if (!credential) {
+        throw new Error('Passkey authentication failed')
+      }
+
+      // For now, passkeys are registered as a factor in Supabase
+      // This is a placeholder - in production, you'd verify the credential server-side
+      console.log('[v0] Passkey authentication initiated:', credential.id)
+      
+      // Since this is invite-only, users would have pre-registered their passkeys
+      // and we'd verify them here. For now, show success.
+      setError('Passkey authentication requires server-side verification setup')
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Passkey authentication failed'
+      setError(message)
+    } finally {
+      setIsPasskeyLoading(false)
+    }
+  }
+
   return (
     <div className="min-h-screen bg-background flex items-center justify-center p-4">
       {/* Background elements */}
@@ -89,6 +119,26 @@ export default function LoginPage() {
             </p>
           </div>
 
+          {/* Passkey Button */}
+          {passkeySupported && (
+            <Button
+              type="button"
+              variant="outline"
+              className="w-full h-12 mb-4 relative"
+              onClick={handlePasskeyLogin}
+              disabled={isPasskeyLoading}
+            >
+              {isPasskeyLoading ? (
+                <Loader2 className="w-5 h-5 animate-spin" />
+              ) : (
+                <>
+                  <Key className="w-5 h-5 mr-2" />
+                  Sign in with passkey
+                </>
+              )}
+            </Button>
+          )}
+
           {/* Google OAuth Button */}
           <Button
             type="button"
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index 74eb952..c49ed5a 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -3,6 +3,7 @@ import { redirect } from 'next/navigation'
 import Link from 'next/link'
 import { LogOut, User, ArrowLeft, Cloud, Globe, Wrench } from 'lucide-react'
 import { Button } from '@/components/ui/button'
+import { PasskeyManager } from '@/components/passkey-manager'
 
 async function signOut() {
   'use server'
@@ -102,31 +103,39 @@ export default async function DashboardPage() {
           </div>
         </div>
 
-        {/* Account info */}
-        <div className="bg-card border border-border rounded-2xl p-6">
-          <h2 className="text-xl font-bold mb-4">Account Information</h2>
-          <div className="space-y-3">
-            <div className="flex justify-between py-2 border-b border-border">
-              <span className="text-muted-foreground">Email</span>
-              <span className="font-medium">{user.email}</span>
-            </div>
-            <div className="flex justify-between py-2 border-b border-border">
-              <span className="text-muted-foreground">Account created</span>
-              <span className="font-medium">
-                {new Date(user.created_at).toLocaleDateString('en-NZ', {
-                  day: 'numeric',
-                  month: 'long',
-                  year: 'numeric'
-                })}
-              </span>
-            </div>
-            <div className="flex justify-between py-2">
-              <span className="text-muted-foreground">Auth provider</span>
-              <span className="font-medium capitalize">
-                {user.app_metadata?.provider || 'Email'}
-              </span>
+        {/* Account Settings */}
+        <div className="grid lg:grid-cols-2 gap-6">
+          {/* Account info */}
+          <div className="bg-card border border-border rounded-2xl p-6">
+            <h2 className="text-xl font-bold mb-4">Account Information</h2>
+            <div className="space-y-3">
+              <div className="flex justify-between py-2 border-b border-border">
+                <span className="text-muted-foreground">Email</span>
+                <span className="font-medium">{user.email}</span>
+              </div>
+              <div className="flex justify-between py-2 border-b border-border">
+                <span className="text-muted-foreground">Account created</span>
+                <span className="font-medium">
+                  {new Date(user.created_at).toLocaleDateString('en-NZ', {
+                    day: 'numeric',
+                    month: 'long',
+                    year: 'numeric'
+                  })}
+                </span>
+              </div>
+              <div className="flex justify-between py-2">
+                <span className="text-muted-foreground">Auth provider</span>
+                <span className="font-medium capitalize">
+                  {user.app_metadata?.provider || 'Email'}
+                </span>
+              </div>
             </div>
           </div>
+
+          {/* Passkey Management */}
+          <div className="bg-card border border-border rounded-2xl p-6">
+            <PasskeyManager />
+          </div>
         </div>
       </main>
     </div>
diff --git a/components/passkey-manager.tsx b/components/passkey-manager.tsx
new file mode 100644
index 0000000..d5e8309
--- /dev/null
+++ b/components/passkey-manager.tsx
@@ -0,0 +1,137 @@
+'use client'
+
+import { useState } from 'react'
+import { Button } from '@/components/ui/button'
+import { Key, Plus, Trash2, Loader2, AlertCircle } from 'lucide-react'
+import { registerPasskey, isPasskeySupported } from '@/lib/passkeys'
+
+export function PasskeyManager() {
+  const [isRegistering, setIsRegistering] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [success, setSuccess] = useState<string | null>(null)
+  const [passkeys, setPasskeys] = useState<Array<{ id: string; name: string; createdAt: string }>>([])
+  const passkeySupported = isPasskeySupported()
+
+  const handleRegisterPasskey = async () => {
+    if (!passkeySupported) {
+      setError('Your browser does not support passkeys')
+      return
+    }
+
+    setIsRegistering(true)
+    setError(null)
+    setSuccess(null)
+
+    try {
+      const credential = await registerPasskey('', 'My Passkey')
+      
+      // In a real implementation, you'd send the credential to your server
+      // and store it securely associated with the user
+      const newPasskey = {
+        id: credential.id,
+        name: 'My Passkey',
+        createdAt: new Date().toLocaleDateString(),
+      }
+      
+      setPasskeys([...passkeys, newPasskey])
+      setSuccess('Passkey registered successfully')
+      
+      // Clear success message after 5 seconds
+      setTimeout(() => setSuccess(null), 5000)
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'Failed to register passkey'
+      setError(message)
+    } finally {
+      setIsRegistering(false)
+    }
+  }
+
+  const handleDeletePasskey = (id: string) => {
+    setPasskeys(passkeys.filter(pk => pk.id !== id))
+    setSuccess('Passkey removed')
+    setTimeout(() => setSuccess(null), 5000)
+  }
+
+  if (!passkeySupported) {
+    return (
+      <div className="p-6 bg-card border border-border rounded-xl">
+        <div className="flex items-center gap-3 text-muted-foreground mb-2">
+          <AlertCircle className="w-5 h-5" />
+          <h3 className="font-semibold">Passkey Support Not Available</h3>
+        </div>
+        <p className="text-sm text-muted-foreground">
+          Your browser does not support passkeys. Please use a modern browser like Chrome, Safari, or Edge.
+        </p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-3">
+          <Key className="w-5 h-5 text-primary" />
+          <h3 className="font-semibold">Passkeys</h3>
+        </div>
+        <Button
+          size="sm"
+          onClick={handleRegisterPasskey}
+          disabled={isRegistering}
+          className="bg-primary hover:bg-primary/90"
+        >
+          {isRegistering ? (
+            <Loader2 className="w-4 h-4 animate-spin mr-2" />
+          ) : (
+            <Plus className="w-4 h-4 mr-2" />
+          )}
+          Add Passkey
+        </Button>
+      </div>
+
+      {error && (
+        <div className="p-3 bg-destructive/10 border border-destructive/50 rounded-lg">
+          <p className="text-sm text-destructive">{error}</p>
+        </div>
+      )}
+
+      {success && (
+        <div className="p-3 bg-primary/10 border border-primary/50 rounded-lg">
+          <p className="text-sm text-primary">{success}</p>
+        </div>
+      )}
+
+      {passkeys.length === 0 ? (
+        <div className="p-6 bg-card border border-border rounded-xl text-center">
+          <Key className="w-12 h-12 text-muted-foreground mx-auto mb-3 opacity-50" />
+          <p className="text-muted-foreground text-sm">
+            No passkeys registered yet. Add one to enable passwordless sign-in.
+          </p>
+        </div>
+      ) : (
+        <div className="space-y-2">
+          {passkeys.map((passkey) => (
+            <div
+              key={passkey.id}
+              className="flex items-center justify-between p-4 bg-card border border-border rounded-lg"
+            >
+              <div>
+                <p className="font-medium">{passkey.name}</p>
+                <p className="text-xs text-muted-foreground">
+                  Added on {passkey.createdAt}
+                </p>
+              </div>
+              <Button
+                size="sm"
+                variant="ghost"
+                onClick={() => handleDeletePasskey(passkey.id)}
+                className="text-destructive hover:text-destructive/90"
+              >
+                <Trash2 className="w-4 h-4" />
+              </Button>
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/lib/passkeys.ts b/lib/passkeys.ts
new file mode 100644
index 0000000..219ee6e
--- /dev/null
+++ b/lib/passkeys.ts
@@ -0,0 +1,83 @@
+'use client'
+
+import { createClient } from '@/lib/supabase/client'
+
+export async function registerPasskey(userId: string, displayName: string) {
+  const supabase = createClient()
+
+  if (!window.PublicKeyCredential) {
+    throw new Error('Passkeys are not supported in your browser')
+  }
+
+  try {
+    // Get registration options from Supabase
+    const { data, error } = await supabase.auth.signInWithEnrollFactors({
+      factorType: 'totp',
+    })
+
+    if (error) throw error
+
+    // For now, we'll use a simplified approach with browser's WebAuthn API
+    // Create a passkey credential
+    const credential = await navigator.credentials.create({
+      publicKey: {
+        challenge: new Uint8Array(32),
+        rp: {
+          name: 'Cloudrite',
+          id: window.location.hostname,
+        },
+        user: {
+          id: new TextEncoder().encode(userId),
+          name: userId,
+          displayName: displayName,
+        },
+        pubKeyCredParams: [{ type: 'public-key', alg: -7 }],
+        timeout: 60000,
+        attestation: 'direct',
+      },
+    }) as PublicKeyCredential | null
+
+    if (!credential) {
+      throw new Error('Failed to create passkey')
+    }
+
+    return credential
+  } catch (error) {
+    console.error('[v0] Passkey registration failed:', error)
+    throw error
+  }
+}
+
+export async function authenticateWithPasskey() {
+  if (!window.PublicKeyCredential) {
+    throw new Error('Passkeys are not supported in your browser')
+  }
+
+  try {
+    const assertion = await navigator.credentials.get({
+      publicKey: {
+        challenge: new Uint8Array(32),
+        timeout: 60000,
+        userVerification: 'preferred',
+      },
+    }) as PublicKeyCredential | null
+
+    if (!assertion) {
+      throw new Error('Passkey authentication cancelled or failed')
+    }
+
+    return assertion
+  } catch (error) {
+    console.error('[v0] Passkey authentication failed:', error)
+    throw error
+  }
+}
+
+export function isPasskeySupported(): boolean {
+  return !!(
+    window.PublicKeyCredential &&
+    navigator.credentials &&
+    navigator.credentials.create &&
+    navigator.credentials.get
+  )
+}