diff --git a/components/settings/unified/UnifiedSettingsModal.tsx b/components/settings/unified/UnifiedSettingsModal.tsx
index 89029e8..b529e14 100644
--- a/components/settings/unified/UnifiedSettingsModal.tsx
+++ b/components/settings/unified/UnifiedSettingsModal.tsx
@@ -210,7 +210,7 @@ function TabContent({
   // Account tabs
   if (context === 'account') {
     switch (activeTab) {
-      case 'profile': return <AccountProfileTab />
+      case 'profile': return <AccountProfileTab {...dirtyProps} />
       case 'security': return <AccountSecurityTab />
       case 'devices': return <AccountDevicesTab />
     }
diff --git a/components/settings/unified/tabs/AccountProfileTab.tsx b/components/settings/unified/tabs/AccountProfileTab.tsx
index 5eecee1..b7ff11d 100644
--- a/components/settings/unified/tabs/AccountProfileTab.tsx
+++ b/components/settings/unified/tabs/AccountProfileTab.tsx
@@ -1,17 +1,141 @@
 'use client'
 
-import ProfileSettings from '@/components/settings/ProfileSettings'
-import TrustedDevicesCard from '@/components/settings/TrustedDevicesCard'
+import { useState, useEffect, useRef, useCallback } from 'react'
+import { Input, Button, toast, Spinner } from '@ciphera-net/ui'
+import { useAuth } from '@/lib/auth/context'
+import { updateDisplayName } from '@/lib/api/user'
+import { deleteAccount } from '@/lib/api/user'
+import { getAuthErrorMessage } from '@ciphera-net/ui'
+
+export default function AccountProfileTab({ onDirtyChange, onRegisterSave }: { onDirtyChange?: (dirty: boolean) => void; onRegisterSave?: (fn: () => Promise<void>) => void }) {
+  const { user, refresh, logout } = useAuth()
+  const [displayName, setDisplayName] = useState('')
+  const initialRef = useRef('')
+  const hasInitialized = useRef(false)
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
+  const [deleteText, setDeleteText] = useState('')
+  const [deleting, setDeleting] = useState(false)
+
+  useEffect(() => {
+    if (!user || hasInitialized.current) return
+    setDisplayName(user.display_name || '')
+    initialRef.current = user.display_name || ''
+    hasInitialized.current = true
+  }, [user])
+
+  // Track dirty state
+  useEffect(() => {
+    if (!hasInitialized.current) return
+    onDirtyChange?.(displayName !== initialRef.current)
+  }, [displayName, onDirtyChange])
+
+  const handleSave = useCallback(async () => {
+    try {
+      await updateDisplayName(displayName.trim())
+      await refresh()
+      initialRef.current = displayName.trim()
+      onDirtyChange?.(false)
+      toast.success('Profile updated')
+    } catch (err) {
+      toast.error(getAuthErrorMessage(err as Error) || 'Failed to update profile')
+    }
+  }, [displayName, refresh, onDirtyChange])
+
+  useEffect(() => {
+    onRegisterSave?.(handleSave)
+  }, [handleSave, onRegisterSave])
+
+  const handleDelete = async () => {
+    if (deleteText !== 'DELETE') return
+    setDeleting(true)
+    try {
+      await deleteAccount()
+      logout()
+    } catch (err) {
+      toast.error(getAuthErrorMessage(err as Error) || 'Failed to delete account')
+      setDeleting(false)
+    }
+  }
+
+  if (!user) return <div className="flex items-center justify-center py-12"><Spinner className="w-6 h-6 text-neutral-500" /></div>
 
-export default function AccountProfileTab() {
   return (
-    <div className="space-y-6">
+    <div className="space-y-8">
       <div>
         <h3 className="text-base font-semibold text-white mb-1">Profile</h3>
         <p className="text-sm text-neutral-400">Manage your personal account settings.</p>
       </div>
 
-      <ProfileSettings activeTab="profile" borderless />
+      {/* Display Name */}
+      <div className="space-y-4">
+        <div>
+          <label className="block text-sm font-medium text-neutral-300 mb-1.5">Display Name</label>
+          <Input
+            value={displayName}
+            onChange={e => setDisplayName(e.target.value)}
+            placeholder="Your name"
+          />
+        </div>
+
+        {/* Email — read-only display */}
+        <div>
+          <label className="block text-sm font-medium text-neutral-300 mb-1.5">Email Address</label>
+          <Input value={user.email} disabled className="opacity-60" />
+          <p className="text-xs text-neutral-500 mt-1">Email changes require password verification. Use <a href="https://auth.ciphera.net/settings" target="_blank" rel="noopener noreferrer" className="text-brand-orange hover:underline">Ciphera Auth</a> to change your email.</p>
+        </div>
+      </div>
+
+      {/* Danger Zone */}
+      <div className="space-y-3 pt-4 border-t border-neutral-800">
+        <h3 className="text-base font-semibold text-red-500">Danger Zone</h3>
+        <div className="rounded-xl border border-red-900/30 bg-red-900/10 p-4">
+          <div className="flex items-center justify-between">
+            <div>
+              <p className="text-sm font-medium text-white">Delete Account</p>
+              <p className="text-xs text-neutral-400">Permanently delete your account and all associated data.</p>
+            </div>
+            <Button
+              variant="secondary"
+              className="text-red-400 border-red-900 hover:bg-red-900/20 text-sm"
+              onClick={() => setShowDeleteConfirm(prev => !prev)}
+            >
+              Delete
+            </Button>
+          </div>
+          {showDeleteConfirm && (
+            <div className="mt-4 p-4 border border-red-900/50 bg-red-900/10 rounded-xl space-y-3">
+              <p className="text-sm text-red-300">This will permanently delete:</p>
+              <ul className="text-xs text-neutral-400 list-disc list-inside space-y-1">
+                <li>Your account and all personal data</li>
+                <li>All sessions and trusted devices</li>
+                <li>You will be removed from all organizations</li>
+              </ul>
+              <div>
+                <label className="block text-xs text-neutral-400 mb-1">Type DELETE to confirm</label>
+                <input
+                  type="text"
+                  value={deleteText}
+                  onChange={e => setDeleteText(e.target.value)}
+                  className="w-full px-3 py-2 border border-neutral-700 rounded-lg bg-neutral-900 text-white text-sm"
+                  placeholder="DELETE"
+                />
+              </div>
+              <div className="flex gap-2">
+                <button
+                  onClick={handleDelete}
+                  disabled={deleteText !== 'DELETE' || deleting}
+                  className="px-4 py-2 bg-red-600 text-white rounded-lg hover:bg-red-700 text-sm font-medium disabled:opacity-50"
+                >
+                  {deleting ? 'Deleting...' : 'Delete Account'}
+                </button>
+                <button onClick={() => { setShowDeleteConfirm(false); setDeleteText('') }} className="px-4 py-2 text-neutral-400 hover:text-white text-sm">
+                  Cancel
+                </button>
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
     </div>
   )
 }