diff --git a/packages/admin/src/components/accounts/account-form.tsx b/packages/admin/src/components/accounts/account-form.tsx
index a9faca1..5441c7c 100644
--- a/packages/admin/src/components/accounts/account-form.tsx
+++ b/packages/admin/src/components/accounts/account-form.tsx
@@ -1,5 +1,6 @@
 import { useForm } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
+import { z } from 'zod'
 import { AccountCreateSchema } from '@forte/shared/schemas'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -17,7 +18,7 @@ interface AccountFormProps {
 }
 
 export function AccountForm({ defaultValues, onSubmit, loading, includeFirstMember }: AccountFormProps) {
-  const optionalNameSchema = AccountCreateSchema.extend({ name: AccountCreateSchema.shape.name.optional() })
+  const optionalNameSchema = AccountCreateSchema.extend({ name: z.string().max(255).optional() })
   const schema = includeFirstMember ? optionalNameSchema : AccountCreateSchema
 
   const {
@@ -29,7 +30,7 @@ export function AccountForm({ defaultValues, onSubmit, loading, includeFirstMemb
   } = useForm({
     resolver: zodResolver(schema),
     defaultValues: {
-      name: defaultValues?.name ?? '',
+      name: defaultValues?.name ?? (includeFirstMember ? undefined : ''),
       email: defaultValues?.email ?? undefined,
       phone: defaultValues?.phone ?? undefined,
       billingMode: defaultValues?.billingMode ?? 'consolidated',
@@ -60,7 +61,7 @@ export function AccountForm({ defaultValues, onSubmit, loading, includeFirstMemb
   }
 
   return (
-    <form id="account-form" onSubmit={handleSubmit(handleFormSubmit)} className="space-y-4 max-w-lg">
+    <form id="account-form" onSubmit={handleSubmit(handleFormSubmit)} noValidate className="space-y-4 max-w-lg">
       <div className="space-y-2">
         <Label htmlFor="name">Account Name {includeFirstMember ? '' : '*'}</Label>
         <Input id="name" {...register('name')} placeholder={includeFirstMember ? 'Auto-generated from member name if blank' : 'e.g. Smith Family, Lincoln Elementary'} />
diff --git a/packages/admin/src/components/accounts/member-form.tsx b/packages/admin/src/components/accounts/member-form.tsx
index 977fadb..a2bf035 100644
--- a/packages/admin/src/components/accounts/member-form.tsx
+++ b/packages/admin/src/components/accounts/member-form.tsx
@@ -38,7 +38,7 @@ export function MemberForm({ accountId, defaultValues, onSubmit, loading }: Memb
   const dateOfBirth = watch('dateOfBirth')
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
+    <form onSubmit={handleSubmit(onSubmit)} noValidate className="space-y-4">
       <input type="hidden" {...register('accountId')} />
       <div className="grid grid-cols-2 gap-4">
         <div className="space-y-2">
diff --git a/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx b/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
index 500cd0f..1f61eb9 100644
--- a/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
+++ b/packages/admin/src/routes/_authenticated/accounts/$accountId/members.tsx
@@ -93,9 +93,10 @@ function MembersTab() {
           <Table>
             <TableHeader>
               <TableRow>
+                <TableHead>#</TableHead>
                 <TableHead>Name</TableHead>
                 <TableHead>Email</TableHead>
-                <TableHead>Date of Birth</TableHead>
+                <TableHead>Phone</TableHead>
                 <TableHead>Status</TableHead>
                 <TableHead className="w-24">Actions</TableHead>
               </TableRow>
@@ -103,9 +104,10 @@ function MembersTab() {
             <TableBody>
               {members.map((m) => (
                 <TableRow key={m.id}>
+                  <TableCell className="font-mono text-sm text-muted-foreground">{m.memberNumber ?? '-'}</TableCell>
                   <TableCell className="font-medium">{m.firstName} {m.lastName}</TableCell>
                   <TableCell>{m.email ?? '-'}</TableCell>
-                  <TableCell>{m.dateOfBirth ?? '-'}</TableCell>
+                  <TableCell>{m.phone ?? '-'}</TableCell>
                   <TableCell>
                     {m.isMinor ? <Badge variant="secondary">Minor</Badge> : <Badge>Adult</Badge>}
                   </TableCell>