diff --git a/src/components/Feed/FeedComments.jsx b/src/components/Feed/FeedComments.jsx
index 082699b8c..8e7db9009 100644
--- a/src/components/Feed/FeedComments.jsx
+++ b/src/components/Feed/FeedComments.jsx
@@ -70,7 +70,7 @@ class FeedComments extends React.Component {
         <Comment
           key={idx}
           avatarUrl={ _.get(item, 'author.photoURL', null) }
-          authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Not Available' }
+          authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user' }
           date={moment(item.date).fromNow()}
           active={item.unread}
           self={ item.author && item.author.userId === currentUser.userId}
diff --git a/src/components/MessageDetails/MessageDetails.jsx b/src/components/MessageDetails/MessageDetails.jsx
index 373c624fc..59f5adf24 100644
--- a/src/components/MessageDetails/MessageDetails.jsx
+++ b/src/components/MessageDetails/MessageDetails.jsx
@@ -46,7 +46,7 @@ class MessageDetails extends React.Component {
         <Comment
           key={idx}
           avatarUrl={ _.get(item, 'author.photoURL', null) }
-          authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Not Available' }
+          authorName={ item.author ? (item.author.firstName + ' ' + item.author.lastName) : 'Connect user' }
           date={moment(item.date).fromNow()}
           active={item.unread}
           self={ item.author && item.author.userId === currentUser.userId }