diff --git a/src/components/comment/view/commentView.js b/src/components/comment/view/commentView.js
index cfb7af1a5..fe97ff758 100644
--- a/src/components/comment/view/commentView.js
+++ b/src/components/comment/view/commentView.js
@@ -56,6 +56,8 @@ class CommentView extends PureComponent {
       marginLeft,
       voteCount,
       intl,
+      author,
+      mainAuthor={mainAuthor}
     } = this.props;
     const { isShowSubComments, isPressedShowButton } = this.state;
 
@@ -68,7 +70,7 @@ class CommentView extends PureComponent {
           reputation={comment.author_reputation}
           size={avatarSize || 24}
           currentAccountUsername={currentAccountUsername}
-          isShowOwnerIndicator={currentAccountUsername === comment.author}
+          isShowOwnerIndicator={mainAuthor === comment.author}
         />
         <View style={[{ marginLeft: marginLeft || 29 }, styles.bodyWrapper]}>
           <PostBody isComment handleOnUserPress={handleOnUserPress} body={comment.body} />
@@ -155,6 +157,7 @@ class CommentView extends PureComponent {
               commentCount={comment.children}
               isShowMoreButton={false}
               fetchPost={fetchPost}
+              mainAuthor={mainAuthor}
             />
           )}
         </View>
diff --git a/src/components/comments/container/commentsContainer.js b/src/components/comments/container/commentsContainer.js
index 6dfdadabf..38d9fcffd 100644
--- a/src/components/comments/container/commentsContainer.js
+++ b/src/components/comments/container/commentsContainer.js
@@ -174,6 +174,7 @@ class CommentsContainer extends Component {
       fetchPost,
       isShowMoreButton,
       selectedFilter,
+      mainAuthor,
       selectedPermlink: _selectedPermlink,
     } = this.props;
 
@@ -183,6 +184,7 @@ class CommentsContainer extends Component {
         selectedFilter={selectedFilter}
         selectedPermlink={_selectedPermlink || selectedPermlink}
         author={author}
+        mainAuthor={mainAuthor}
         isShowMoreButton={isShowMoreButton}
         commentNumber={commentNumber || 1}
         commentCount={commentCount}
diff --git a/src/components/comments/view/commentsView.js b/src/components/comments/view/commentsView.js
index f84fe473c..9de1cfcf9 100644
--- a/src/components/comments/view/commentsView.js
+++ b/src/components/comments/view/commentsView.js
@@ -26,6 +26,7 @@ class CommentsView extends PureComponent {
 
   render() {
     const {
+      mainAuthor,
       avatarSize,
       commentCount,
       commentNumber,
@@ -47,6 +48,7 @@ class CommentsView extends PureComponent {
         keyExtractor={this._keyExtractor}
         renderItem={({ item }) => (
           <Comment
+            mainAuthor={mainAuthor}
             avatarSize={avatarSize}
             comment={item}
             commentCount={commentCount || item.children}
diff --git a/src/components/commentsDisplay/view/commentsDisplayView.js b/src/components/commentsDisplay/view/commentsDisplayView.js
index 9472fb922..7b3de738c 100644
--- a/src/components/commentsDisplay/view/commentsDisplayView.js
+++ b/src/components/commentsDisplay/view/commentsDisplayView.js
@@ -32,7 +32,7 @@ class CommentsDisplayView extends PureComponent {
 
   render() {
     const {
-      author, commentCount, fetchPost, intl, permlink,
+      author, commentCount, fetchPost, intl, permlink, mainAuthor
     } = this.props;
     const { selectedFilter } = this.state;
 
@@ -55,6 +55,7 @@ class CommentsDisplayView extends PureComponent {
                 commentCount={commentCount}
                 author={author}
                 permlink={permlink}
+                mainAuthor={mainAuthor}
               />
             </View>
           </Fragment>
diff --git a/src/components/postView/view/postDisplayView.js b/src/components/postView/view/postDisplayView.js
index 782396933..dcdc61c2b 100644
--- a/src/components/postView/view/postDisplayView.js
+++ b/src/components/postView/view/postDisplayView.js
@@ -168,6 +168,7 @@ class PostDisplayView extends PureComponent {
           {post && (isGetComment || isLoadedComments) && (
             <CommentsDisplay
               author={post.author}
+              mainAuthor={post.author}
               permlink={post.permlink}
               commentCount={post.children}
               fetchPost={fetchPost}