diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index eda2924..fc2f304 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -85,7 +85,7 @@
         "hooks": [
           {
             "type": "prompt",
-            "prompt": "Verifique se as alterações feitas nesta sessão afetam alguma informação documentada no CLAUDE.md ou nos ficheiros em docs/. Se sim, atualize os ficheiros relevantes para refletir as mudanças (novos componentes, mudanças de arquitetura, novos utilitários, alterações no modelo de dados, etc.). Se nenhuma alteração relevante foi feita, não é necessário atualizar."
+            "prompt": "Se as alterações desta sessão introduziram novos componentes públicos exportados, mudanças de arquitetura, novos hooks/utilitários partilhados, alterações no modelo de dados ou novos padrões de código — atualize os ficheiros relevantes em CLAUDE.md ou docs/. Mudanças puramente visuais (animações, z-index, estilos, refactors internos de componente) não requerem atualização de documentação e esta verificação pode terminar sem acção."
           }
         ]
       }
diff --git a/src/components/AppSidebar.tsx b/src/components/AppSidebar.tsx
index e503ef0..e48b223 100644
--- a/src/components/AppSidebar.tsx
+++ b/src/components/AppSidebar.tsx
@@ -25,12 +25,6 @@ import {
   Tooltip,
   TooltipTrigger,
   TooltipContent,
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
 } from "@/components/ui"
 
 import { canAccessView } from "@/lib/accessControl"
@@ -103,6 +97,121 @@ function getInitials(email?: string) {
   return name.slice(0, 2).toUpperCase()
 }
 
+interface UserIdentityPanelProps {
+  userEmail?: string
+  userAvatarUrl?: string | null
+  onGoToProfile: () => void
+  onSignOut: () => void
+}
+
+function UserIdentityPanel({ userEmail, userAvatarUrl, onGoToProfile, onSignOut }: UserIdentityPanelProps) {
+  const [open, setOpen] = useState(false)
+  const triggerRef = useRef<HTMLButtonElement>(null)
+  const panelRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    if (!open) return
+    function handleClick(e: MouseEvent) {
+      if (
+        !triggerRef.current?.contains(e.target as Node) &&
+        !panelRef.current?.contains(e.target as Node)
+      ) {
+        setOpen(false)
+      }
+    }
+    document.addEventListener("mousedown", handleClick)
+    return () => document.removeEventListener("mousedown", handleClick)
+  }, [open])
+
+  const initials = getInitials(userEmail)
+  const displayName = userEmail?.split("@")[0].replace(/[._-]/g, " ") ?? ""
+  const formattedName = displayName
+    .split(" ")
+    .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+    .join(" ")
+
+  return (
+    <div className="relative">
+      <motion.button
+        ref={triggerRef}
+        onClick={() => setOpen((v) => !v)}
+        whileHover={{ scale: 1.06 }}
+        whileTap={{ scale: 0.94 }}
+        transition={{ type: "spring", stiffness: 400, damping: 28 }}
+        className={cn(
+          "w-9 h-9 rounded-xl flex items-center justify-center text-[11px] font-bold overflow-hidden shrink-0 cursor-pointer",
+          "bg-foreground text-background",
+          open && "ring-2 ring-foreground/30 ring-offset-1 ring-offset-[oklch(0.948_0.005_250)] dark:ring-offset-[oklch(0.138_0.009_250)]"
+        )}
+        aria-label="Menu do utilizador"
+        aria-expanded={open}
+      >
+        {userAvatarUrl ? (
+          <img src={userAvatarUrl} alt="" className="w-full h-full object-cover" />
+        ) : (
+          initials
+        )}
+      </motion.button>
+
+      <AnimatePresence>
+        {open && (
+          <motion.div
+            ref={panelRef}
+            initial={{ clipPath: "inset(100% 0% 0% 0%)", opacity: 0 }}
+            animate={{ clipPath: "inset(0% 0% 0% 0%)", opacity: 1 }}
+            exit={{ clipPath: "inset(0% 0% 100% 0%)", opacity: 0 }}
+            transition={{
+              clipPath: { duration: 0.2, ease: [0.4, 0, 1, 1] },
+              opacity: { duration: 0.15 },
+            }}
+            className={cn(
+              "absolute bottom-full left-full mb-0 ml-2 z-[80]",
+              "w-[220px] rounded-xl overflow-hidden",
+              "bg-card border border-border",
+              "shadow-[0_8px_32px_oklch(0_0_0/0.12)]"
+            )}
+          >
+            {/* Identity header */}
+            <div className="p-4 flex items-center gap-3 border-b border-border">
+              <div className="w-10 h-10 rounded-xl bg-foreground text-background flex items-center justify-center text-sm font-bold shrink-0 overflow-hidden">
+                {userAvatarUrl ? (
+                  <img src={userAvatarUrl} alt="" className="w-full h-full object-cover" />
+                ) : (
+                  initials
+                )}
+              </div>
+              <div className="min-w-0">
+                <p className="text-sm font-semibold text-foreground leading-tight truncate">{formattedName}</p>
+                <p className="text-xs text-muted-foreground truncate mt-0.5">{userEmail}</p>
+              </div>
+            </div>
+
+            {/* Actions */}
+            <div className="p-1.5 flex flex-col gap-0.5">
+              {[
+                { icon: UserCircle, label: "Meu Perfil", action: () => { onGoToProfile(); setOpen(false) }, delay: 0.04 },
+                { icon: LogOut, label: "Sair", action: () => { onSignOut(); setOpen(false) }, delay: 0.08 },
+              ].map(({ icon: Icon, label, action, delay }) => (
+                <motion.button
+                  key={label}
+                  onClick={action}
+                  initial={{ opacity: 0, x: -6 }}
+                  animate={{ opacity: 1, x: 0 }}
+                  transition={{ duration: 0.18, delay, ease: "easeOut" }}
+                  className="w-full flex items-center gap-2.5 px-2.5 py-2 rounded-lg text-sm text-foreground hover:bg-muted transition-colors duration-150 cursor-pointer"
+                >
+                  <Icon className="w-4 h-4 text-muted-foreground shrink-0" />
+                  {label}
+                </motion.button>
+              ))}
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  )
+}
+
 function getClientInitials(name: string) {
   const parts = name.trim().split(/\s+/)
   if (parts.length >= 2) return (parts[0][0] + parts[1][0]).toUpperCase()
@@ -615,41 +724,13 @@ export function AppSidebar() {
           <TooltipContent side="right">Ajuda</TooltipContent>
         </Tooltip>
 
-        {/* User avatar */}
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <button
-              className={cn(
-                "w-9 h-9 rounded-md flex items-center justify-center text-[11px] font-bold overflow-hidden shrink-0",
-                "bg-foreground text-background",
-                "hover:opacity-80 transition-opacity duration-150",
-                "ring-2 ring-foreground/10 ring-offset-1 ring-offset-[oklch(0.948_0.005_250)] dark:ring-offset-[oklch(0.138_0.009_250)]"
-              )}
-              aria-label="Menu do utilizador"
-            >
-              {userAvatarUrl ? (
-                <img src={userAvatarUrl} alt="" className="w-full h-full object-cover" />
-              ) : (
-                getInitials(userEmail)
-              )}
-            </button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent side="right" align="end">
-            <DropdownMenuLabel className="truncate max-w-48 font-normal text-muted-foreground">
-              {userEmail}
-            </DropdownMenuLabel>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem onClick={() => onViewChange("profile")}>
-              <UserCircle className="w-4 h-4 mr-2" />
-              Meu Perfil
-            </DropdownMenuItem>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem onClick={onSignOut}>
-              <LogOut className="w-4 h-4 mr-2" />
-              Sair
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
+        {/* User avatar — identity panel */}
+        <UserIdentityPanel
+          userEmail={userEmail}
+          userAvatarUrl={userAvatarUrl}
+          onGoToProfile={() => onViewChange("profile")}
+          onSignOut={onSignOut}
+        />
       </div>
     </aside>
   )
diff --git a/src/components/ClientPickerLayout.tsx b/src/components/ClientPickerLayout.tsx
index 11f2603..d0b0bcd 100644
--- a/src/components/ClientPickerLayout.tsx
+++ b/src/components/ClientPickerLayout.tsx
@@ -70,7 +70,7 @@ export function ClientPickerLayout({
 
       <div className="flex flex-row flex-1 overflow-hidden">
         {/* Mini-sidebar — sempre recolhida */}
-        <aside className="hidden md:flex flex-col border-r bg-card w-[52px]">
+        <aside className="hidden md:flex flex-col border-r bg-card w-[52px] relative z-20">
           <div className="flex-1 flex flex-col items-center pt-4 gap-3">
             <div className="w-8 h-8 rounded-md bg-muted flex items-center justify-center opacity-30" />
             <div className="w-6 h-1 rounded bg-muted opacity-20" />
diff --git a/src/store/useAdminStore.ts b/src/store/useAdminStore.ts
index e12142c..7397062 100644
--- a/src/store/useAdminStore.ts
+++ b/src/store/useAdminStore.ts
@@ -130,7 +130,12 @@ export const useAdminStore = create<AdminStore>()(
         set({ loadingInitial: true, error: null })
         try {
           const { fetchClients, fetchUsers, fetchUserClientsMap, fetchPendingUsers } = get()
-          await Promise.all([fetchClients(), fetchUsers(), fetchUserClientsMap(), fetchPendingUsers()])
+          await Promise.all([
+            fetchClients(),
+            fetchUsers(),
+            fetchUserClientsMap(),
+            fetchPendingUsers().catch(() => undefined),
+          ])
           set({ initialized: true })
         } catch (err) {
           set({ error: toSafeUiErrorMessage(err instanceof Error ? err.message : null) })
diff --git a/src/views/client-picker/ClientPickerView.tsx b/src/views/client-picker/ClientPickerView.tsx
index 79849be..979ce2f 100644
--- a/src/views/client-picker/ClientPickerView.tsx
+++ b/src/views/client-picker/ClientPickerView.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from "react"
+import { motion } from "framer-motion"
 import { ClientCard } from "./components/ClientCard"
 import type { ClientOption } from "@/contexts/AuthContext"
 
@@ -8,8 +9,18 @@ interface ClientPickerViewProps {
   onSelectClient: (client: ClientOption) => void
 }
 
+const wordVariants = {
+  hidden: { opacity: 0, y: 24 },
+  visible: (i: number) => ({
+    opacity: 1,
+    y: 0,
+    transition: { duration: 0.5, delay: i * 0.07, ease: [0.16, 1, 0.3, 1] as [number, number, number, number] },
+  }),
+}
+
 export function ClientPickerView({ userName, clients, onSelectClient }: ClientPickerViewProps) {
   const firstName = userName.split(" ")[0]
+  const headlineWords = ["Qual", "projeto", "hoje?"]
 
   useEffect(() => {
     if (clients.length === 1) {
@@ -19,9 +30,16 @@ export function ClientPickerView({ userName, clients, onSelectClient }: ClientPi
 
   if (clients.length === 1) return null
 
+  const gridCols =
+    clients.length === 2
+      ? "grid-cols-2 max-w-xl"
+      : clients.length === 3
+        ? "grid-cols-3 max-w-3xl"
+        : "grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 max-w-5xl"
+
   return (
     <div className="relative flex flex-col items-center justify-center h-full overflow-hidden bg-neutral-50 dark:bg-neutral-950">
-      {/* Grade de fundo estilo blueprint */}
+      {/* Grade de fundo blueprint */}
       <div
         className="absolute inset-0 opacity-[0.04] dark:opacity-[0.07]"
         style={{
@@ -31,18 +49,60 @@ export function ClientPickerView({ userName, clients, onSelectClient }: ClientPi
         }}
       />
 
-<div className="relative z-10 flex flex-col items-center gap-10 w-full max-w-3xl px-6 py-16">
+      {/* Halo central */}
+      <div
+        className="absolute inset-0 pointer-events-none"
+        style={{
+          background:
+            "radial-gradient(ellipse 60% 50% at 50% 50%, oklch(0.92 0 0 / 0.6) 0%, transparent 70%)",
+        }}
+      />
+      <div
+        className="absolute inset-0 pointer-events-none dark:block hidden"
+        style={{
+          background:
+            "radial-gradient(ellipse 60% 50% at 50% 50%, oklch(0.22 0 0 / 0.7) 0%, transparent 70%)",
+        }}
+      />
+
+      <div className="relative z-10 flex flex-col items-center gap-12 w-full px-6 py-16">
         {/* Cabeçalho */}
-        <div className="flex flex-col items-center gap-3 text-center">
-          <div className="inline-flex items-center gap-2 rounded-full border border-border bg-background px-4 py-1.5 text-xs text-muted-foreground font-medium tracking-wide uppercase">
+        <div className="flex flex-col items-center gap-4 text-center">
+          <motion.div
+            initial={{ opacity: 0, y: -8 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ duration: 0.4, ease: "easeOut" }}
+            className="inline-flex items-center gap-2 rounded-full bg-foreground text-background px-4 py-1.5 text-xs font-medium tracking-widest uppercase"
+          >
             Bem-vindo, {firstName}
-          </div>
-          <h1 className="text-4xl font-bold tracking-tight text-foreground">
-            Qual projeto hoje?
+          </motion.div>
+
+          <h1
+            className="flex gap-[0.25em] text-5xl sm:text-6xl tracking-tight text-foreground"
+            style={{ fontFamily: "'Syne', sans-serif", fontWeight: 800 }}
+          >
+            {headlineWords.map((word, i) => (
+              <motion.span
+                key={word}
+                custom={i}
+                variants={wordVariants}
+                initial="hidden"
+                animate="visible"
+                style={{ display: "inline-block" }}
+              >
+                {word}
+              </motion.span>
+            ))}
           </h1>
-          <p className="text-sm text-muted-foreground max-w-xs">
+
+          <motion.p
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            transition={{ duration: 0.5, delay: 0.35 }}
+            className="text-sm text-muted-foreground max-w-xs"
+          >
             Selecione um cliente para acessar o painel de capacity planning.
-          </p>
+          </motion.p>
         </div>
 
         {/* Grid de clientes */}
@@ -51,11 +111,12 @@ export function ClientPickerView({ userName, clients, onSelectClient }: ClientPi
             Nenhum cliente associado à sua conta.
           </p>
         ) : (
-          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 w-full">
-            {clients.map((client) => (
+          <div className={`grid ${gridCols} gap-4 w-full mx-auto`}>
+            {clients.map((client, i) => (
               <ClientCard
                 key={client.id}
                 client={client}
+                index={i}
                 onClick={() => onSelectClient(client)}
               />
             ))}
diff --git a/src/views/client-picker/components/ClientCard.tsx b/src/views/client-picker/components/ClientCard.tsx
index 4264c33..e62d314 100644
--- a/src/views/client-picker/components/ClientCard.tsx
+++ b/src/views/client-picker/components/ClientCard.tsx
@@ -1,38 +1,98 @@
-import { ArrowRight } from "lucide-react"
-import { cn } from "@/lib/utils"
+import { motion } from "framer-motion"
 import type { ClientOption } from "@/contexts/AuthContext"
 
 interface ClientCardProps {
   client: ClientOption
   onClick: () => void
+  index: number
 }
 
-export function ClientCard({ client, onClick }: ClientCardProps) {
+export function ClientCard({ client, onClick, index }: ClientCardProps) {
   const initials = client.name.slice(0, 2).toUpperCase()
 
   return (
-    <button
+    <motion.button
       onClick={onClick}
-      className={cn(
-        "group relative flex flex-col justify-between gap-8 rounded-2xl border border-border cursor-pointer",
-        "bg-background hover:bg-muted/40 dark:hover:bg-neutral-900",
-        "p-7 text-left transition-all duration-200",
-        "hover:border-foreground/20 hover:shadow-md"
-      )}
+      initial={{ clipPath: "inset(50% 0% 50% 0%)", opacity: 0 }}
+      animate={{ clipPath: "inset(0% 0% 0% 0%)", opacity: 1 }}
+      transition={{
+        clipPath: { duration: 0.5, delay: index * 0.08, ease: [0.16, 1, 0.3, 1] },
+        opacity: { duration: 0.2, delay: index * 0.08 },
+      }}
+      whileHover="hover"
+      className="group relative flex flex-col justify-between gap-8 rounded-2xl border border-border cursor-pointer bg-background p-7 text-left overflow-hidden"
+      style={{ WebkitClipPath: "inset(0% 0% 0% 0%)" }}
     >
+      {/* Fundo invertido que expande no hover */}
+      <motion.div
+        className="absolute inset-0 bg-foreground"
+        initial={{ scaleY: 0, originY: 1 }}
+        variants={{
+          hover: { scaleY: 1, transition: { duration: 0.3, ease: [0.16, 1, 0.3, 1] } },
+        }}
+        style={{ transformOrigin: "bottom" }}
+      />
+
       {/* Avatar */}
-      <div className="flex items-center justify-between">
-        <div className="flex items-center justify-center w-12 h-12 rounded-xl bg-foreground text-background text-base font-bold shrink-0 tracking-tight">
-          {initials}
-        </div>
-        <ArrowRight className="w-4 h-4 text-muted-foreground opacity-0 group-hover:opacity-100 group-hover:translate-x-0.5 transition-all duration-200" />
+      <div className="relative flex items-center justify-between">
+        <motion.div
+          className="flex items-center justify-center w-12 h-12 rounded-xl text-base font-bold shrink-0 tracking-tight"
+          variants={{
+            hover: { scale: 1.05, transition: { duration: 0.25, ease: "easeOut" } },
+          }}
+          style={{ backgroundColor: "var(--foreground)", color: "var(--background)" }}
+        >
+          <motion.span
+            variants={{
+              hover: { color: "var(--foreground)", transition: { duration: 0.25 } },
+            }}
+            style={{ color: "var(--background)" }}
+          >
+            {initials}
+          </motion.span>
+        </motion.div>
+
+        <motion.div
+          className="w-6 h-6 rounded-full flex items-center justify-center"
+          initial={{ opacity: 0, x: -4 }}
+          variants={{
+            hover: { opacity: 1, x: 0, transition: { duration: 0.2, delay: 0.05 } },
+          }}
+        >
+          <motion.svg
+            width="14"
+            height="14"
+            viewBox="0 0 14 14"
+            fill="none"
+            variants={{ hover: { stroke: "var(--background)" } }}
+            style={{ stroke: "var(--muted-foreground)" }}
+          >
+            <path d="M2 7h10M8 3l4 4-4 4" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" />
+          </motion.svg>
+        </motion.div>
       </div>
 
       {/* Nome */}
-      <div>
-        <p className="font-semibold text-lg text-foreground leading-tight">{client.name}</p>
-        <p className="text-xs text-muted-foreground mt-1">Acessar painel</p>
+      <div className="relative">
+        <motion.p
+          className="font-semibold text-lg leading-tight"
+          style={{ color: "var(--foreground)" }}
+          variants={{
+            hover: { color: "var(--background)", transition: { duration: 0.2 } },
+          }}
+        >
+          {client.name}
+        </motion.p>
+        <motion.p
+          className="text-xs mt-1"
+          style={{ color: "var(--muted-foreground)" }}
+          variants={{
+            hover: { color: "oklch(0.7 0 0)", transition: { duration: 0.2 } },
+          }}
+        >
+          Acessar painel
+        </motion.p>
       </div>
-    </button>
+    </motion.button>
   )
 }
diff --git a/src/views/profile/ProfileView.tsx b/src/views/profile/ProfileView.tsx
index ef4de97..14fd77f 100644
--- a/src/views/profile/ProfileView.tsx
+++ b/src/views/profile/ProfileView.tsx
@@ -1,5 +1,6 @@
-import { useState, type ComponentType } from 'react'
+import { useState, useId, type ComponentType } from 'react'
 import { User, Settings, Bell } from 'lucide-react'
+import { motion, AnimatePresence } from 'framer-motion'
 import { AccountSection } from './components/AccountSection'
 import { PreferencesSection } from './components/PreferencesSection'
 import { NotificationsSection } from './components/NotificationsSection'
@@ -16,6 +17,7 @@ const TABS: { key: ProfileTab; label: string; icon: ComponentType<{ className?:
 
 export function ProfileView() {
   const [tab, setTab] = useState<ProfileTab>('account')
+  const indicatorId = useId()
   const {
     member,
     preferences,
@@ -32,8 +34,42 @@ export function ProfileView() {
 
   if (loading) {
     return (
-      <div className="flex items-center justify-center py-24">
-        <div className="w-5 h-5 border-2 border-primary border-t-transparent rounded-full animate-spin" />
+      <div className="w-full space-y-8">
+        <div className="flex items-center justify-between">
+          <div className="h-8 w-32 bg-muted rounded-md animate-pulse" />
+          <div className="flex gap-1 border-b border-border pb-px">
+            {[80, 96, 104].map((w) => (
+              <div key={w} className="h-9 rounded-t-md bg-muted animate-pulse" style={{ width: w }} />
+            ))}
+          </div>
+        </div>
+
+        <div className="max-w-xl space-y-6">
+          <div className="space-y-1.5">
+            <div className="h-5 w-48 bg-muted rounded animate-pulse" />
+            <div className="h-4 w-64 bg-muted rounded animate-pulse" />
+          </div>
+          <div className="flex items-center gap-4">
+            <div className="w-16 h-16 rounded-full bg-muted animate-pulse shrink-0" />
+            <div className="flex-1 space-y-1.5">
+              <div className="h-3.5 w-24 bg-muted rounded animate-pulse" />
+              <div className="h-9 w-full bg-muted rounded-md animate-pulse" />
+            </div>
+          </div>
+          <div className="space-y-1.5">
+            <div className="h-3.5 w-16 bg-muted rounded animate-pulse" />
+            <div className="h-9 w-full bg-muted rounded-md animate-pulse" />
+          </div>
+          <div className="grid grid-cols-2 gap-4">
+            {[0, 1, 2, 3].map((i) => (
+              <div key={i} className="space-y-1.5">
+                <div className="h-3.5 w-20 bg-muted rounded animate-pulse" />
+                <div className="h-9 w-full bg-muted rounded-md animate-pulse" />
+              </div>
+            ))}
+          </div>
+          <div className="h-9 w-36 bg-muted rounded-md animate-pulse" />
+        </div>
       </div>
     )
   }
@@ -41,68 +77,83 @@ export function ProfileView() {
   if (!member) return null
 
   return (
-    <div className="max-w-4xl mx-auto">
-      <div className="mb-8">
-        <h1 className="text-2xl font-bold">Meu Perfil</h1>
-        <p className="text-muted-foreground mt-1">Gerencie suas informações e preferências.</p>
-      </div>
+    <div className="w-full space-y-8">
+      <div className="flex items-center justify-between">
+        <h1 className="text-2xl font-semibold">Meu Perfil</h1>
 
-      <div className="flex gap-8">
-        {/* Sidebar */}
-        <nav className="w-48 shrink-0">
-          <ul className="space-y-1">
+        <nav aria-label="Seções do perfil">
+          <ul className="flex gap-1 border-b border-border" role="tablist">
             {TABS.map(({ key, label, icon: Icon }) => (
-              <li key={key}>
+              <li key={key} role="presentation">
                 <button
+                  role="tab"
+                  aria-selected={tab === key}
+                  aria-controls={`panel-${key}`}
+                  id={`tab-${key}`}
                   onClick={() => setTab(key)}
-                  className={`w-full flex items-center gap-2.5 px-3 py-2 rounded-lg text-sm font-medium transition-colors text-left ${
+                  className={`relative flex items-center gap-2 px-4 py-2.5 text-sm font-medium transition-colors cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 rounded-t-md ${
                     tab === key
-                      ? 'bg-primary text-primary-foreground'
-                      : 'text-muted-foreground hover:text-foreground hover:bg-muted'
+                      ? 'text-foreground'
+                      : 'text-muted-foreground hover:text-foreground'
                   }`}
                 >
-                  <Icon className="w-4 h-4 shrink-0" />
+                  <Icon className="w-3.5 h-3.5 shrink-0" />
                   {label}
+                  {tab === key && (
+                    <motion.span
+                      layoutId={indicatorId}
+                      className="absolute inset-x-0 -bottom-px h-0.5 bg-foreground rounded-full"
+                      transition={{ type: 'spring', stiffness: 500, damping: 40 }}
+                    />
+                  )}
                 </button>
               </li>
             ))}
           </ul>
         </nav>
+      </div>
 
-        {/* Content */}
-        <div className="flex-1 min-w-0">
-          <div className="border rounded-xl p-6">
-            {tab === 'account' && (
-              <AccountSection
-                key={member.id}
-                member={member}
-                saving={saving}
-                error={error}
-                successMessage={successMessage}
-                onSave={updateProfile}
-              />
-            )}
+      <AnimatePresence mode="wait" initial={false}>
+        <motion.div
+          key={tab}
+          role="tabpanel"
+          id={`panel-${tab}`}
+          aria-labelledby={`tab-${tab}`}
+          initial={{ opacity: 0, y: 6 }}
+          animate={{ opacity: 1, y: 0 }}
+          exit={{ opacity: 0, y: -4 }}
+          transition={{ duration: 0.18, ease: [0.16, 1, 0.3, 1] }}
+        >
+          {tab === 'account' && (
+            <AccountSection
+              key={member.id}
+              member={member}
+              saving={saving}
+              error={error}
+              successMessage={successMessage}
+              onSave={updateProfile}
+            />
+          )}
 
-            {tab === 'preferences' && preferences && (
-              <PreferencesSection
-                preferences={preferences}
-                savingPrefs={savingPrefs}
-                clients={clients}
-                onUpdate={updatePreferences}
-              />
-            )}
+          {tab === 'preferences' && preferences && (
+            <PreferencesSection
+              preferences={preferences}
+              savingPrefs={savingPrefs}
+              clients={clients}
+              onUpdate={updatePreferences}
+            />
+          )}
 
-            {tab === 'notifications' && preferences && (
-              <NotificationsSection
-                preferences={preferences}
-                isAdmin={member.access_role === 'admin'}
-                savingPrefs={savingPrefs}
-                onUpdate={updatePreferences}
-              />
-            )}
-          </div>
-        </div>
-      </div>
+          {tab === 'notifications' && preferences && (
+            <NotificationsSection
+              preferences={preferences}
+              isAdmin={member.access_role === 'admin'}
+              savingPrefs={savingPrefs}
+              onUpdate={updatePreferences}
+            />
+          )}
+        </motion.div>
+      </AnimatePresence>
     </div>
   )
 }
diff --git a/src/views/profile/components/AccountSection.tsx b/src/views/profile/components/AccountSection.tsx
index 33757fb..9e8ca68 100644
--- a/src/views/profile/components/AccountSection.tsx
+++ b/src/views/profile/components/AccountSection.tsx
@@ -65,90 +65,104 @@ export function AccountSection({ member, saving, error, successMessage, onSave }
   const initials = (member.avatar ?? member.name?.slice(0, 2) ?? '?').toUpperCase()
 
   return (
-    <section className="space-y-6">
-      <div>
-        <h2 className="text-lg font-semibold">Informações da Conta</h2>
-        <p className="text-sm text-muted-foreground mt-1">Gerencie seus dados pessoais.</p>
-      </div>
+    <section className="space-y-10">
 
-      {/* Avatar */}
-      <div className="flex items-center gap-4">
-        <div className="w-16 h-16 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xl font-semibold shrink-0 overflow-hidden">
-          {displayAvatar ? (
-            <img src={displayAvatar} alt="Avatar" className="w-full h-full object-cover" />
-          ) : (
-            initials
-          )}
+      {/* Editar perfil */}
+      <div className="grid grid-cols-1 lg:grid-cols-[220px_1fr] gap-8">
+        <div>
+          <h2 className="text-sm font-semibold">Informações pessoais</h2>
+          <p className="text-sm text-muted-foreground mt-1">Nome e foto de perfil visíveis para o time.</p>
         </div>
-        <div className="flex-1 min-w-0">
-          <Label htmlFor="avatar_url">URL do Avatar</Label>
-          <Input
-            id="avatar_url"
-            value={avatarUrl}
-            onChange={(e) => { setAvatarUrl(e.target.value); setDirty(true) }}
-            placeholder="https://exemplo.com/foto.jpg"
-            className="mt-1"
-          />
-          {avatarError && <p className="text-xs text-destructive mt-1">{avatarError}</p>}
+
+        <div className="space-y-5">
+          <div className="flex items-center gap-4">
+            <div className="w-14 h-14 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-lg font-semibold shrink-0 overflow-hidden">
+              {displayAvatar ? (
+                <img src={displayAvatar} alt="Avatar" className="w-full h-full object-cover" />
+              ) : (
+                initials
+              )}
+            </div>
+            <div className="flex-1 min-w-0">
+              <Label htmlFor="avatar_url">URL do Avatar</Label>
+              <Input
+                id="avatar_url"
+                value={avatarUrl}
+                onChange={(e) => { setAvatarUrl(e.target.value); setDirty(true) }}
+                placeholder="https://exemplo.com/foto.jpg"
+                className="mt-1"
+              />
+              {avatarError && <p className="text-xs text-destructive mt-1">{avatarError}</p>}
+            </div>
+          </div>
+
+          <div>
+            <Label htmlFor="name">Nome</Label>
+            <Input
+              id="name"
+              value={name}
+              onChange={(e) => { setName(e.target.value); setDirty(true) }}
+              placeholder="Seu nome"
+              className="mt-1"
+            />
+            {nameError && <p className="text-xs text-destructive mt-1">{nameError}</p>}
+          </div>
+
+          {error && <p className="text-sm text-destructive">{error}</p>}
+          {successMessage && <p className="text-sm text-green-600 dark:text-green-400">{successMessage}</p>}
+
+          <Button onClick={handleSave} disabled={saving || !dirty}>
+            {saving ? 'Salvando…' : 'Salvar alterações'}
+          </Button>
         </div>
       </div>
 
-      {/* Nome */}
-      <div>
-        <Label htmlFor="name">Nome</Label>
-        <Input
-          id="name"
-          value={name}
-          onChange={(e) => { setName(e.target.value); setDirty(true) }}
-          placeholder="Seu nome"
-          className="mt-1"
-        />
-        {nameError && <p className="text-xs text-destructive mt-1">{nameError}</p>}
-      </div>
+      <div className="border-t border-border" />
 
-      {/* Campos somente leitura */}
-      <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-        <div className="space-y-1">
-          <Label className="flex items-center gap-1.5 text-muted-foreground">
-            <Mail className="w-3.5 h-3.5" />
-            E-mail
-          </Label>
-          <p className="text-sm py-2 px-3 bg-muted rounded-md border border-transparent">{member.email ?? '—'}</p>
+      {/* Dados somente leitura */}
+      <div className="grid grid-cols-1 lg:grid-cols-[220px_1fr] gap-8">
+        <div>
+          <h2 className="text-sm font-semibold">Dados da conta</h2>
+          <p className="text-sm text-muted-foreground mt-1">Informações gerenciadas pelo administrador.</p>
         </div>
 
-        <div className="space-y-1">
-          <Label className="flex items-center gap-1.5 text-muted-foreground">
-            <User className="w-3.5 h-3.5" />
-            Função
-          </Label>
-          <p className="text-sm py-2 px-3 bg-muted rounded-md border border-transparent">{member.role ?? '—'}</p>
-        </div>
+        <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+          <div className="space-y-1">
+            <Label className="flex items-center gap-1.5 text-muted-foreground">
+              <Mail className="w-3.5 h-3.5" />
+              E-mail
+            </Label>
+            <p className="text-sm py-2 px-3 bg-muted rounded-md">{member.email ?? '—'}</p>
+          </div>
 
-        <div className="space-y-1">
-          <Label className="flex items-center gap-1.5 text-muted-foreground">
-            <Shield className="w-3.5 h-3.5" />
-            Tipo de acesso
-          </Label>
-          <div className="py-1.5">
-            <Badge variant={accessRoleVariant}>{accessRoleLabel}</Badge>
+          <div className="space-y-1">
+            <Label className="flex items-center gap-1.5 text-muted-foreground">
+              <User className="w-3.5 h-3.5" />
+              Função
+            </Label>
+            <p className="text-sm py-2 px-3 bg-muted rounded-md">{member.role ?? '—'}</p>
           </div>
-        </div>
 
-        <div className="space-y-1">
-          <Label className="flex items-center gap-1.5 text-muted-foreground">
-            <Calendar className="w-3.5 h-3.5" />
-            Membro desde
-          </Label>
-          <p className="text-sm py-2 px-3 bg-muted rounded-md border border-transparent">{formatDate(member.created_at)}</p>
+          <div className="space-y-1">
+            <Label className="flex items-center gap-1.5 text-muted-foreground">
+              <Shield className="w-3.5 h-3.5" />
+              Tipo de acesso
+            </Label>
+            <div className="py-1.5">
+              <Badge variant={accessRoleVariant}>{accessRoleLabel}</Badge>
+            </div>
+          </div>
+
+          <div className="space-y-1">
+            <Label className="flex items-center gap-1.5 text-muted-foreground">
+              <Calendar className="w-3.5 h-3.5" />
+              Membro desde
+            </Label>
+            <p className="text-sm py-2 px-3 bg-muted rounded-md">{formatDate(member.created_at)}</p>
+          </div>
         </div>
       </div>
 
-      {error && <p className="text-sm text-destructive">{error}</p>}
-      {successMessage && <p className="text-sm text-green-600 dark:text-green-400">{successMessage}</p>}
-
-      <Button onClick={handleSave} disabled={saving || !dirty}>
-        {saving ? 'Salvando…' : 'Salvar alterações'}
-      </Button>
     </section>
   )
 }
diff --git a/src/views/profile/components/NotificationsSection.tsx b/src/views/profile/components/NotificationsSection.tsx
index e24dfa3..0e60615 100644
--- a/src/views/profile/components/NotificationsSection.tsx
+++ b/src/views/profile/components/NotificationsSection.tsx
@@ -51,6 +51,18 @@ function SwitchRow({ id, label, description, icon, checked, disabled, onChange }
   )
 }
 
+function SectionRow({ title, description, children }: { title: string; description: string; children: React.ReactNode }) {
+  return (
+    <div className="grid grid-cols-1 lg:grid-cols-[220px_1fr] gap-8">
+      <div>
+        <h2 className="text-sm font-semibold">{title}</h2>
+        <p className="text-sm text-muted-foreground mt-1">{description}</p>
+      </div>
+      <div>{children}</div>
+    </div>
+  )
+}
+
 export function NotificationsSection({ preferences, isAdmin, savingPrefs, onUpdate }: NotificationsSectionProps) {
   const handleStalledDays = (value: string) => {
     const n = parseInt(value, 10)
@@ -67,18 +79,9 @@ export function NotificationsSection({ preferences, isAdmin, savingPrefs, onUpda
   }
 
   return (
-    <section className="space-y-8">
-      <div>
-        <h2 className="text-lg font-semibold">Notificações</h2>
-        <p className="text-sm text-muted-foreground mt-1">
-          Escolha quais alertas automáticos você deseja receber.
-        </p>
-      </div>
-
-      {/* Alertas */}
-      <div className="space-y-1">
-        <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3">Alertas</h3>
+    <section className="space-y-10">
 
+      <SectionRow title="Alertas" description="Escolha quais notificações automáticas receber.">
         <div className="divide-y divide-border">
           <SwitchRow
             id="notification_step_overdue"
@@ -110,54 +113,52 @@ export function NotificationsSection({ preferences, isAdmin, savingPrefs, onUpda
             />
           )}
         </div>
-      </div>
+      </SectionRow>
 
-      {/* Thresholds — só admins */}
       {isAdmin && (
-        <div className="space-y-4">
-          <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Limites</h3>
-          <p className="text-xs text-muted-foreground -mt-2">
-            Estes valores se aplicam a todos os membros dos seus clientes.
-          </p>
+        <>
+          <div className="border-t border-border" />
 
-          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-            <div className="space-y-1.5">
-              <label htmlFor="stalled_days_threshold" className="text-sm font-medium flex items-center gap-1.5">
-                <AlertTriangle className="w-3.5 h-3.5 text-muted-foreground" />
-                Dias sem atividade
-              </label>
-              <p className="text-xs text-muted-foreground">Para considerar uma demanda parada (1–30 dias).</p>
-              <Input
-                id="stalled_days_threshold"
-                type="number"
-                min={1}
-                max={30}
-                defaultValue={preferences.stalled_days_threshold}
-                disabled={savingPrefs}
-                className="w-24"
-                onBlur={(e) => handleStalledDays(e.target.value)}
-              />
-            </div>
+          <SectionRow title="Limites" description="Aplicados a todos os membros dos seus clientes.">
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-6">
+              <div className="space-y-1.5">
+                <label htmlFor="stalled_days_threshold" className="text-sm font-medium flex items-center gap-1.5">
+                  <AlertTriangle className="w-3.5 h-3.5 text-muted-foreground" />
+                  Dias sem atividade
+                </label>
+                <p className="text-xs text-muted-foreground">Para considerar uma demanda parada (1–30 dias).</p>
+                <Input
+                  id="stalled_days_threshold"
+                  type="number"
+                  min={1}
+                  max={30}
+                  defaultValue={preferences.stalled_days_threshold}
+                  disabled={savingPrefs}
+                  className="w-24"
+                  onBlur={(e) => handleStalledDays(e.target.value)}
+                />
+              </div>
 
-            <div className="space-y-1.5">
-              <label htmlFor="overload_threshold" className="text-sm font-medium flex items-center gap-1.5">
-                <Users className="w-3.5 h-3.5 text-muted-foreground" />
-                Limite de sobrecarga
-              </label>
-              <p className="text-xs text-muted-foreground">Nº de demandas simultâneas para alertar (1–20).</p>
-              <Input
-                id="overload_threshold"
-                type="number"
-                min={1}
-                max={20}
-                defaultValue={preferences.overload_threshold}
-                disabled={savingPrefs}
-                className="w-24"
-                onBlur={(e) => handleOverloadThreshold(e.target.value)}
-              />
+              <div className="space-y-1.5">
+                <label htmlFor="overload_threshold" className="text-sm font-medium flex items-center gap-1.5">
+                  <Users className="w-3.5 h-3.5 text-muted-foreground" />
+                  Limite de sobrecarga
+                </label>
+                <p className="text-xs text-muted-foreground">Nº de demandas simultâneas para alertar (1–20).</p>
+                <Input
+                  id="overload_threshold"
+                  type="number"
+                  min={1}
+                  max={20}
+                  defaultValue={preferences.overload_threshold}
+                  disabled={savingPrefs}
+                  className="w-24"
+                  onBlur={(e) => handleOverloadThreshold(e.target.value)}
+                />
+              </div>
             </div>
-          </div>
-        </div>
+          </SectionRow>
+        </>
       )}
 
       {savingPrefs && <p className="text-xs text-muted-foreground">Salvando…</p>}
diff --git a/src/views/profile/components/PreferencesSection.tsx b/src/views/profile/components/PreferencesSection.tsx
index 79d734d..57f08ea 100644
--- a/src/views/profile/components/PreferencesSection.tsx
+++ b/src/views/profile/components/PreferencesSection.tsx
@@ -11,8 +11,19 @@ interface PreferencesSectionProps {
   onUpdate: (prefs: Partial<Pick<UserPreferences, 'theme' | 'language' | 'notifications_enabled' | 'default_view' | 'client_order' | 'notification_step_overdue' | 'notification_task_stalled' | 'notification_member_overloaded' | 'stalled_days_threshold' | 'overload_threshold'>>) => Promise<boolean>
 }
 
+function SectionRow({ title, description, children }: { title: string; description: string; children: React.ReactNode }) {
+  return (
+    <div className="grid grid-cols-1 lg:grid-cols-[220px_1fr] gap-8">
+      <div>
+        <h2 className="text-sm font-semibold">{title}</h2>
+        <p className="text-sm text-muted-foreground mt-1">{description}</p>
+      </div>
+      <div>{children}</div>
+    </div>
+  )
+}
+
 export function PreferencesSection({ preferences, savingPrefs, clients, onUpdate }: PreferencesSectionProps) {
-  // Build ordered client list: first clients in client_order, then the rest
   const orderedClientIds: string[] = (() => {
     const known = new Set(clients.map((c) => c.id))
     const saved = (preferences.client_order ?? []).filter((id) => known.has(id))
@@ -45,78 +56,67 @@ export function PreferencesSection({ preferences, savingPrefs, clients, onUpdate
   }
 
   return (
-    <section className="space-y-8">
-      <div>
-        <h2 className="text-lg font-semibold">Preferências</h2>
-        <p className="text-sm text-muted-foreground mt-1">Configure sua experiência na plataforma.</p>
-      </div>
-
-      {/* Aparência */}
-      <div className="space-y-4">
-        <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Aparência</h3>
-
-        <div className="space-y-1.5">
-          <Label className="flex items-center gap-1.5">
-            <Palette className="w-3.5 h-3.5" />
-            Tema
-          </Label>
-          <Select
-            value={preferences.theme}
-            onValueChange={(v) => onUpdate({ theme: v as UserPreferences['theme'] })}
-            disabled={savingPrefs}
-          >
-            <SelectTrigger className="w-full sm:w-60">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="system">Sistema (automático)</SelectItem>
-              <SelectItem value="light">Claro</SelectItem>
-              <SelectItem value="dark">Escuro</SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
-      </div>
-
-      {/* Regional */}
-      <div className="space-y-4">
-        <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Regional</h3>
+    <section className="space-y-10">
+
+      <SectionRow title="Aparência" description="Tema e idioma da interface.">
+        <div className="space-y-5">
+          <div className="space-y-1.5">
+            <Label className="flex items-center gap-1.5">
+              <Palette className="w-3.5 h-3.5" />
+              Tema
+            </Label>
+            <Select
+              value={preferences.theme}
+              onValueChange={(v) => onUpdate({ theme: v as UserPreferences['theme'] })}
+              disabled={savingPrefs}
+            >
+              <SelectTrigger className="w-full sm:w-64">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="system">Sistema (automático)</SelectItem>
+                <SelectItem value="light">Claro</SelectItem>
+                <SelectItem value="dark">Escuro</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
 
-        <div className="space-y-1.5">
-          <Label className="flex items-center gap-1.5">
-            <Globe className="w-3.5 h-3.5" />
-            Idioma
-          </Label>
-          <Select
-            value={preferences.language}
-            onValueChange={(v) => onUpdate({ language: v as UserPreferences['language'] })}
-            disabled={savingPrefs}
-          >
-            <SelectTrigger className="w-full sm:w-60">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="pt-BR">Português (Brasil)</SelectItem>
-              <SelectItem value="en">English</SelectItem>
-            </SelectContent>
-          </Select>
+          <div className="space-y-1.5">
+            <Label className="flex items-center gap-1.5">
+              <Globe className="w-3.5 h-3.5" />
+              Idioma
+            </Label>
+            <Select
+              value={preferences.language}
+              onValueChange={(v) => onUpdate({ language: v as UserPreferences['language'] })}
+              disabled={savingPrefs}
+            >
+              <SelectTrigger className="w-full sm:w-64">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="pt-BR">Português (Brasil)</SelectItem>
+                <SelectItem value="en">English</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
         </div>
-      </div>
+      </SectionRow>
 
-      {/* Navegação */}
-      <div className="space-y-4">
-        <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Navegação</h3>
+      <div className="border-t border-border" />
 
+      <SectionRow title="Navegação" description="View exibida ao entrar no app.">
         <div className="space-y-1.5">
           <Label className="flex items-center gap-1.5">
             <LayoutDashboard className="w-3.5 h-3.5" />
-            View inicial ao entrar
+            View inicial
           </Label>
           <Select
             value={preferences.default_view}
             onValueChange={(v) => onUpdate({ default_view: v as UserPreferences['default_view'] })}
             disabled={savingPrefs}
           >
-            <SelectTrigger className="w-full sm:w-60">
+            <SelectTrigger className="w-full sm:w-64">
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
@@ -127,17 +127,13 @@ export function PreferencesSection({ preferences, savingPrefs, clients, onUpdate
             </SelectContent>
           </Select>
         </div>
-      </div>
+      </SectionRow>
 
-      {/* Ordem de clientes */}
       {clients.length > 0 && (
-        <div className="space-y-4">
-          <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Clientes</h3>
+        <>
+          <div className="border-t border-border" />
 
-          <div>
-            <p className="text-sm text-muted-foreground mb-3">
-              Arraste para reordenar a exibição dos clientes na barra lateral.
-            </p>
+          <SectionRow title="Clientes" description="Arraste para reordenar a exibição na barra lateral.">
             <ul className="space-y-1.5">
               {orderedClientIds.map((clientId, index) => {
                 const client = clientById[clientId]
@@ -163,14 +159,13 @@ export function PreferencesSection({ preferences, savingPrefs, clients, onUpdate
                 )
               })}
             </ul>
-          </div>
-        </div>
+          </SectionRow>
+        </>
       )}
 
-      {/* Notificações */}
-      <div className="space-y-4">
-        <h3 className="text-sm font-medium text-muted-foreground uppercase tracking-wide">Notificações</h3>
+      <div className="border-t border-border" />
 
+      <SectionRow title="Notificações" description="Ativar ou desativar alertas do sistema.">
         <div className="flex items-start gap-3">
           <Checkbox
             id="notifications_enabled"
@@ -187,7 +182,7 @@ export function PreferencesSection({ preferences, savingPrefs, clients, onUpdate
             <p className="text-xs text-muted-foreground mt-0.5">Receber notificações sobre demandas e atualizações.</p>
           </div>
         </div>
-      </div>
+      </SectionRow>
 
       {savingPrefs && <p className="text-xs text-muted-foreground">Salvando…</p>}
     </section>
diff --git a/supabase/functions/admin-users/index.ts b/supabase/functions/admin-users/index.ts
index f9bd3a6..ed4f076 100644
--- a/supabase/functions/admin-users/index.ts
+++ b/supabase/functions/admin-users/index.ts
@@ -34,12 +34,17 @@ Deno.serve(async (req) => {
 
     if (action === 'listPending') {
       const allowedDomain = Deno.env.get('ALLOWED_DOMAIN')
-      const { data, error } = await db.auth.admin.listUsers()
-      if (error || !data) return json({ error: error?.message ?? 'Failed' }, 500)
-      const { data: members } = await db.from('members').select('auth_user_id')
-      const linked = new Set((members ?? []).map((m) => m.auth_user_id).filter(Boolean))
+
+      const [{ data: members }, { data: authData, error }] = await Promise.all([
+        db.from('members').select('auth_user_id'),
+        db.auth.admin.listUsers({ perPage: 1000, page: 1 }),
+      ])
+
+      if (error || !authData) return json({ error: error?.message ?? 'Failed' }, 500)
+
+      const linked = new Set((members ?? []).map((m: { auth_user_id: string | null }) => m.auth_user_id).filter(Boolean))
       const pending = []
-      for (const u of data.users) {
+      for (const u of authData.users) {
         if (!u.email) continue
         const domain = u.email.split('@')[1]
         if (allowedDomain && domain !== allowedDomain) continue
diff --git a/supabase/migrations/20260525000003_admin_perf_indexes.sql b/supabase/migrations/20260525000003_admin_perf_indexes.sql
new file mode 100644
index 0000000..ddd65f0
--- /dev/null
+++ b/supabase/migrations/20260525000003_admin_perf_indexes.sql
@@ -0,0 +1,15 @@
+-- Índices de performance para queries do painel admin
+
+-- audit_logs: colunas usadas nos filtros de adminFetchAuditLogs
+CREATE INDEX IF NOT EXISTS idx_audit_logs_client_id    ON audit_logs(client_id);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_user_id      ON audit_logs(user_id);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_entity        ON audit_logs(entity);
+CREATE INDEX IF NOT EXISTS idx_audit_logs_created_at   ON audit_logs(created_at DESC);
+-- ilike em entity_name não beneficia de btree; pg_trgm seria o ideal mas requer extensão
+-- este índice parcial cobre o caso de busca sem filtro de nome
+CREATE INDEX IF NOT EXISTS idx_audit_logs_entity_name  ON audit_logs(entity_name);
+
+-- user_clients: client_id é usado em JOINs e filtros por cliente
+CREATE INDEX IF NOT EXISTS idx_user_clients_client_id  ON user_clients(client_id);
+-- user_id já deve ter índice via FK, mas garantimos
+CREATE INDEX IF NOT EXISTS idx_user_clients_user_id    ON user_clients(user_id);