diff --git a/surfsense_web/components/tool-ui/gmail/create-draft.tsx b/surfsense_web/components/tool-ui/gmail/create-draft.tsx
index 7cd6a6c27..52b65002c 100644
--- a/surfsense_web/components/tool-ui/gmail/create-draft.tsx
+++ b/surfsense_web/components/tool-ui/gmail/create-draft.tsx
@@ -275,7 +275,7 @@ function ApprovalCard({
 											<SelectContent>
 												{validAccounts.map((account) => (
 													<SelectItem key={account.id} value={String(account.id)}>
-														{account.email}
+														{account.name}
 													</SelectItem>
 												))}
 												{expiredAccounts.map((a) => (
@@ -283,7 +283,7 @@ function ApprovalCard({
 														key={a.id}
 														className="relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 px-2 text-sm select-none opacity-50 pointer-events-none"
 													>
-														{a.email} (expired, retry after re-auth)
+														{a.name} (expired, retry after re-auth)
 													</div>
 												))}
 											</SelectContent>
diff --git a/surfsense_web/components/tool-ui/gmail/send-email.tsx b/surfsense_web/components/tool-ui/gmail/send-email.tsx
index f5c855cee..6bfa3034d 100644
--- a/surfsense_web/components/tool-ui/gmail/send-email.tsx
+++ b/surfsense_web/components/tool-ui/gmail/send-email.tsx
@@ -264,8 +264,7 @@ function ApprovalCard({
 						{interruptData.context.error ? (
 							<p className="text-sm text-destructive">{interruptData.context.error}</p>
 						) : (
-							<>
-								{accounts.length > 0 && (
+							accounts.length > 0 && (
 									<div className="space-y-2">
 										<p className="text-xs font-medium text-muted-foreground">
 											Gmail Account <span className="text-destructive">*</span>
@@ -277,7 +276,7 @@ function ApprovalCard({
 											<SelectContent>
 												{validAccounts.map((account) => (
 													<SelectItem key={account.id} value={String(account.id)}>
-														{account.email}
+														{account.name}
 													</SelectItem>
 												))}
 												{expiredAccounts.map((a) => (
@@ -285,14 +284,13 @@ function ApprovalCard({
 														key={a.id}
 														className="relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 px-2 text-sm select-none opacity-50 pointer-events-none"
 													>
-														{a.email} (expired, retry after re-auth)
+														{a.name} (expired, retry after re-auth)
 													</div>
 												))}
 											</SelectContent>
 										</Select>
 									</div>
-								)}
-							</>
+								)
 						)}
 					</div>
 				</>
@@ -307,13 +305,13 @@ function ApprovalCard({
 						<span>To: {pendingEdits?.to ?? args.to}</span>
 					</div>
 				)}
-				{(pendingEdits?.cc ?? args.cc) && (pendingEdits?.cc ?? args.cc)!.trim() !== "" && (
+				{(pendingEdits?.cc ?? args.cc) && (pendingEdits?.cc ?? args.cc)?.trim() !== "" && (
 					<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
 						<UsersIcon className="size-3 shrink-0" />
 						<span>CC: {pendingEdits?.cc ?? args.cc}</span>
 					</div>
 				)}
-				{(pendingEdits?.bcc ?? args.bcc) && (pendingEdits?.bcc ?? args.bcc)!.trim() !== "" && (
+				{(pendingEdits?.bcc ?? args.bcc) && (pendingEdits?.bcc ?? args.bcc)?.trim() !== "" && (
 					<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
 						<UsersIcon className="size-3 shrink-0" />
 						<span>BCC: {pendingEdits?.bcc ?? args.bcc}</span>
diff --git a/surfsense_web/components/tool-ui/gmail/trash-email.tsx b/surfsense_web/components/tool-ui/gmail/trash-email.tsx
index 6a7af5c59..8b1a6ee12 100644
--- a/surfsense_web/components/tool-ui/gmail/trash-email.tsx
+++ b/surfsense_web/components/tool-ui/gmail/trash-email.tsx
@@ -225,7 +225,7 @@ function ApprovalCard({
 									<div className="space-y-2">
 										<p className="text-xs font-medium text-muted-foreground">Gmail Account</p>
 										<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
-											{account.email}
+											{account.name}
 										</div>
 									</div>
 								)}