diff --git a/web/app/components/comment/__username/comment__username.scss b/web/app/components/comment/__username/comment__username.scss
index 75f1b9ed..ea3a492a 100644
--- a/web/app/components/comment/__username/comment__username.scss
+++ b/web/app/components/comment/__username/comment__username.scss
@@ -1,4 +1,11 @@
 .comment__username {
   color: #777;
   font-weight: 700;
+  text-decoration: none;
+
+  &:link {
+    &:hover {
+      text-decoration: underline;
+    }
+  }
 }
diff --git a/web/app/components/comment/comment.jsx b/web/app/components/comment/comment.jsx
index 2e2d98c3..440d0b1a 100644
--- a/web/app/components/comment/comment.jsx
+++ b/web/app/components/comment/comment.jsx
@@ -201,7 +201,17 @@ export default class Comment extends Component {
 
           <div className="comment__content">
             <div className="comment__info">
-              <span className="comment__username">{o.user.name}</span>
+              {
+                mods.view !== 'preview' && (
+                  <span className="comment__username">{o.user.name}</span>
+                )
+              }
+
+              {
+                mods.view === 'preview' && (
+                  <a href={`${o.locator.url}#remark__comment-${o.id}`} className="comment__username">{o.user.name}</a>
+                )
+              }
 
               {
                 !isGuest && (