diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js
index 0157942d..2fa32165 100644
--- a/src/forge/comments/children_comments.js
+++ b/src/forge/comments/children_comments.js
@@ -141,7 +141,7 @@ class children_comments extends Component {
               {item && item.user_name}
             </Link>
           </div>
-          <div className="ml30">
+          <div className="ml40">
             {this.commentCtx(item.content)}
             {item && item.attachments && item.attachments.length > 0 ? (
               <Attachments
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index 338bff16..50473586 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -395,7 +395,7 @@ class comments extends Component {
               {item && item.user_name}
             </Link>
           </div>
-          <div className="ml30">
+          <div className="ml40">
             {item.content ? (
               this.commentCtx(item.content)
             ) : (
@@ -488,9 +488,9 @@ class comments extends Component {
                     <img
                       className="radius"
                       src={
-                        current_user
+                        current_user && current_user.image_url
                           ? getImageUrl(`images/${current_user.image_url}`)
-                          : "/images/avatars/User/b"
+                          : "images/avatars/User/b"
                       }
                       alt=""
                       width="30"