diff --git a/src/discussions/comments/CommentsView.jsx b/src/discussions/comments/CommentsView.jsx
index 775b1808..e347e5d6 100644
--- a/src/discussions/comments/CommentsView.jsx
+++ b/src/discussions/comments/CommentsView.jsx
@@ -25,7 +25,7 @@ import { EmptyPage } from '../empty-posts';
 import { Post } from '../posts';
 import { selectThread } from '../posts/data/selectors';
 import { fetchThread, markThreadAsRead } from '../posts/data/thunks';
-import { discussionsPath, filterPosts } from '../utils';
+import { discussionsPath, filterPosts, isLastElementOfList } from '../utils';
 import { selectThreadComments, selectThreadCurrentPage, selectThreadHasMorePages } from './data/selectors';
 import { fetchThreadComments } from './data/thunks';
 import { Comment, ResponseEditor } from './comment';
@@ -99,13 +99,13 @@ function DiscussionCommentsView({
 
   const handleComments = (postComments, showLoadMoreResponses = false) => (
     <div className="mx-4" role="list">
-      {postComments.map((comment, index) => (
+      {postComments.map((comment) => (
         <Comment
           comment={comment}
           key={comment.id}
           postType={postType}
           isClosedPost={isClosed}
-          marginBottom={index === (postComments.length - 1)}
+          marginBottom={isLastElementOfList(postComments, comment)}
         />
 
       ))}
diff --git a/src/discussions/common/AuthorLabel.jsx b/src/discussions/common/AuthorLabel.jsx
index 7beb46f7..45c2e03a 100644
--- a/src/discussions/common/AuthorLabel.jsx
+++ b/src/discussions/common/AuthorLabel.jsx
@@ -43,6 +43,7 @@ function AuthorLabel({
   }
 
   const isRetiredUser = author ? author.startsWith('retired__user') : false;
+  const showTextPrimary = !authorLabelMessage && !isRetiredUser && !alert;
 
   const className = classNames('d-flex align-items-center', { 'mb-0.5': !postOrComment }, labelColor);
 
@@ -91,7 +92,7 @@ function AuthorLabel({
       {authorLabelMessage && (
         <span
           className={classNames('mr-1.5 font-size-14 font-style-normal font-family-inter font-weight-500', {
-            'text-primary-500': !authorLabelMessage && !isRetiredUser && !alert,
+            'text-primary-500': showTextPrimary,
             'text-gray-700': isRetiredUser,
           })}
           style={{ marginLeft: '2px' }}
diff --git a/src/discussions/utils.js b/src/discussions/utils.js
index eb64370d..4c4f8cc0 100644
--- a/src/discussions/utils.js
+++ b/src/discussions/utils.js
@@ -294,3 +294,7 @@ export function handleKeyDown(event) {
     selectedOption.focus();
   }
 }
+
+export function isLastElementOfList(list, element) {
+  return list[list.length - 1] === element;
+}