diff --git a/apps/web/src/components/Avatar.tsx b/apps/web/src/components/Avatar.tsx
index f65daf20..0abcbb17 100644
--- a/apps/web/src/components/Avatar.tsx
+++ b/apps/web/src/components/Avatar.tsx
@@ -27,7 +27,7 @@ const Avatar = ({
 }) => {
   const initials = name
     ? getInitialsFromName(name)
-    : inferInitialsFromEmail(email ?? "");
+    : inferInitialsFromEmail(email);
 
   return (
     <>
diff --git a/apps/web/src/views/board/components/Card.tsx b/apps/web/src/views/board/components/Card.tsx
index 15b177e3..2d5d48b1 100644
--- a/apps/web/src/views/board/components/Card.tsx
+++ b/apps/web/src/views/board/components/Card.tsx
@@ -12,6 +12,7 @@ const Card = ({
   labels: { name: string; colourCode: string | null }[];
   members: {
     publicId: string;
+    email: string;
     user: { name: string | null; email: string; image: string | null } | null;
   }[];
 }) => {
@@ -29,17 +30,15 @@ const Card = ({
             ))}
           </div>
           <div className="isolate flex justify-end -space-x-1 overflow-hidden">
-            {members.map(({ user }) => {
-              if (!user) return null;
-
-              const avatarUrl = user.image
+            {members.map(({ user, email }) => {
+              const avatarUrl = user?.image
                 ? getAvatarUrl(user.image)
                 : undefined;
 
               return (
                 <Avatar
-                  name={user.name ?? ""}
-                  email={user.email}
+                  name={user?.name ?? ""}
+                  email={user?.email ?? email}
                   imageUrl={avatarUrl}
                   size="sm"
                 />
diff --git a/apps/web/src/views/board/components/NewCardForm.tsx b/apps/web/src/views/board/components/NewCardForm.tsx
index 06e10977..ba76f42e 100644
--- a/apps/web/src/views/board/components/NewCardForm.tsx
+++ b/apps/web/src/views/board/components/NewCardForm.tsx
@@ -149,7 +149,7 @@ export function NewCardForm({
       key: member.publicId,
       value: formatMemberDisplayName(
         member.user?.name ?? null,
-        member.user?.email ?? null,
+        member.user?.email ?? member.email,
       ),
       leftIcon: (
         <Avatar
@@ -158,7 +158,7 @@ export function NewCardForm({
           imageUrl={
             member.user?.image ? getAvatarUrl(member.user.image) : undefined
           }
-          email={member.user?.email ?? ""}
+          email={member.user?.email ?? member.email}
         />
       ),
     })) ?? [];
diff --git a/apps/web/src/views/card/index.tsx b/apps/web/src/views/card/index.tsx
index cb609fc5..29eed41a 100644
--- a/apps/web/src/views/card/index.tsx
+++ b/apps/web/src/views/card/index.tsx
@@ -89,7 +89,7 @@ export default function CardPage() {
         key: member.publicId,
         value: formatMemberDisplayName(
           member.user?.name ?? null,
-          member.user?.email ?? null,
+          member.user?.email ?? member.email,
         ),
         imageUrl: member.user?.image
           ? getAvatarUrl(member.user.image)
@@ -102,7 +102,7 @@ export default function CardPage() {
             imageUrl={
               member.user?.image ? getAvatarUrl(member.user.image) : undefined
             }
-            email={member.user?.email ?? ""}
+            email={member.user?.email ?? member.email}
           />
         ),
       };
diff --git a/packages/db/src/repository/board.repo.ts b/packages/db/src/repository/board.repo.ts
index b288402d..35f944fa 100644
--- a/packages/db/src/repository/board.repo.ts
+++ b/packages/db/src/repository/board.repo.ts
@@ -93,6 +93,7 @@ export const getByPublicId = async (
           members: {
             columns: {
               publicId: true,
+              email: true,
             },
             with: {
               user: {
@@ -148,6 +149,7 @@ export const getByPublicId = async (
                   member: {
                     columns: {
                       publicId: true,
+                      email: true,
                       deletedAt: true,
                     },
                     with: {
diff --git a/packages/db/src/repository/card.repo.ts b/packages/db/src/repository/card.repo.ts
index 60bbbf6c..790dc4ba 100644
--- a/packages/db/src/repository/card.repo.ts
+++ b/packages/db/src/repository/card.repo.ts
@@ -336,6 +336,7 @@ export const getWithListAndMembersByPublicId = async (
                   members: {
                     columns: {
                       publicId: true,
+                      email: true,
                     },
                     with: {
                       user: {
@@ -362,6 +363,7 @@ export const getWithListAndMembersByPublicId = async (
           member: {
             columns: {
               publicId: true,
+              email: true,
             },
             with: {
               user: {