diff --git a/app/(auth)/mfa/enroll/page.tsx b/app/(auth)/mfa/enroll/page.tsx
index 975ed680..50c08839 100644
--- a/app/(auth)/mfa/enroll/page.tsx
+++ b/app/(auth)/mfa/enroll/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState, useRef } from 'react'
+import { useState, useRef, Suspense } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { createClient } from '@/lib/supabase/client'
 import { Button } from '@/components/ui/button'
@@ -10,6 +10,14 @@ import { useToast } from '@/components/ui/use-toast'
 import { Loader2, ShieldCheck, Copy, Check } from 'lucide-react'
 
 export default function MfaEnrollPage() {
+  return (
+    <Suspense>
+      <MfaEnrollContent />
+    </Suspense>
+  )
+}
+
+function MfaEnrollContent() {
   const [qrCode, setQrCode] = useState<string | null>(null)
   const [secret, setSecret] = useState<string | null>(null)
   const [factorId, setFactorId] = useState<string | null>(null)
diff --git a/components/settings/SecuritySettings.tsx b/components/settings/SecuritySettings.tsx
index 247faf00..d8873a10 100644
--- a/components/settings/SecuritySettings.tsx
+++ b/components/settings/SecuritySettings.tsx
@@ -84,7 +84,6 @@ export function SecuritySettings() {
         title: 'Lösenord uppdaterat',
         description: 'Ditt lösenord har ändrats.',
       })
-      setCurrentPassword('')
       setNewPassword('')
       setConfirmPassword('')
     } catch {