diff --git a/src/components/TinyMCEEditor.jsx b/src/components/TinyMCEEditor.jsx
index fc6162246..1464304f4 100644
--- a/src/components/TinyMCEEditor.jsx
+++ b/src/components/TinyMCEEditor.jsx
@@ -76,7 +76,7 @@ const TinyMCEEditor = (props) => {
       const filename = blobInfo.filename();
       const { location } = await uploadFile(blob, filename, courseId, postId || 'root');
       const img = new Image();
-      img.onload = function () {
+      img.onload = () => {
         if (img.height > 999 || img.width > 999) { setShowImageWarning(true); }
       };
       img.src = location;
diff --git a/src/discussions/post-comments/comments/comment/CommentHeader.jsx b/src/discussions/post-comments/comments/comment/CommentHeader.jsx
index bee096778..48f1d026d 100644
--- a/src/discussions/post-comments/comments/comment/CommentHeader.jsx
+++ b/src/discussions/post-comments/comments/comment/CommentHeader.jsx
@@ -16,6 +16,8 @@ const CommentHeader = ({
   const colorClass = AvatarOutlineAndLabelColors[comment.authorLabel];
   const hasAnyAlert = useAlertBannerVisible(comment);
 
+  const profileImage = Boolean(comment.users) && Object.values(comment.users)[0].profile.image;
+
   return (
     <div className={classNames('d-flex flex-row justify-content-between', {
       'mt-2': hasAnyAlert,
@@ -25,6 +27,7 @@ const CommentHeader = ({
         <Avatar
           className={`border-0 ml-0.5 mr-2.5 ${colorClass ? `outline-${colorClass}` : 'outline-anonymous'}`}
           alt={comment.author}
+          src={profileImage.hasImage ? profileImage.imageUrlSmall : undefined}
           style={{
             width: '32px',
             height: '32px',
diff --git a/src/discussions/posts/post/PostHeader.jsx b/src/discussions/posts/post/PostHeader.jsx
index 451a94d66..51db71041 100644
--- a/src/discussions/posts/post/PostHeader.jsx
+++ b/src/discussions/posts/post/PostHeader.jsx
@@ -38,6 +38,8 @@ export const PostAvatar = ({
     return spacing;
   }, [post.type]);
 
+  const profileImage = Boolean(post.users) && Object.values(post.users)[0].profile.image;
+
   return (
     <div className={avatarSpacing}>
       {post.type === ThreadType.QUESTION && (
@@ -59,6 +61,7 @@ export const PostAvatar = ({
           height: avatarSize,
           width: avatarSize,
         }}
+        src={profileImage.hasImage ? profileImage.imageUrlSmall : undefined}
         alt={post.author}
       />
     </div>