diff --git a/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx b/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
index 203842dc..01275762 100644
--- a/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
+++ b/src/visualBuilder/components/Collab/ThreadPopup/CommentTextArea.tsx
@@ -102,12 +102,22 @@ const MentionSuggestionsList: React.FC<{
                     tabIndex={-1}
                     aria-selected={index === selectedIndex}
                 >
-                    {(user.display?.length || 0) > 20 ? (
-                        <Tooltip content={user.display || ""}>
-                            {(user.display || "").substring(0, 18) + "..."}
-                        </Tooltip>
+                    {user.display == user.email ? (
+                        user.display.length > 20 ? (
+                            <Tooltip content={user.display || ""}>
+                                {(user.display || "").substring(0, 18) + "..."}
+                            </Tooltip>
+                        ) : (
+                            user.display
+                        )
                     ) : (
-                        user.display || ""
+                        <Tooltip
+                            content={user.display + " - " + user.email || ""}
+                        >
+                            {user.display.length > 20
+                                ? (user.display || "").substring(0, 18) + "..."
+                                : user.display}
+                        </Tooltip>
                     )}
                 </li>
             ))}