2 files changed, 19 insertions, 9 deletions

diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index c4b2cd117..8847753a5 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
@@ -21,18 +21,20 @@
 
         <div class="comment-account-date">
           <div class="comment-account">
-            <a
-              [routerLink]="[ '/accounts', comment.by ]"
-              class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }"
-            >
-              {{ comment.account.displayName }}
-            </a>
+            <a [routerLink]="[ '/accounts', comment.by ]">
+              <span class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }">
+                {{ comment.account.displayName }}
+              </span>
 
-            <a [href]="comment.account.url" target="_blank" rel="noopener noreferrer" class="comment-account-fid ml-1">{{ comment.by }}</a>
+              <span class="comment-account-fid ml-1">{{ comment.by }}</span>
+            </a>
           </div>
-          <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]"
-             class="comment-date" [title]="comment.createdAt">{{ comment.createdAt | myFromNow }}</a>
+
+          <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt">
+            {{ comment.createdAt | myFromNow }}
+          </a>
         </div>
+
         <div
           class="comment-html"
           [innerHTML]="sanitizedCommentHTML"
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
index 61fd24c70..f6ff376b9 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
@@ -71,6 +71,10 @@
           @include disable-default-a-behaviour;
 
           color: pvar(--mainForegroundColor);
+
+          &:hover {
+            text-decoration: underline;
+          }
         }
 
         .comment-account-fid {
@@ -83,6 +87,10 @@
         color: pvar(--greyForegroundColor);
         margin-left: 5px;
         text-decoration: none;
+
+        &:hover {
+          text-decoration: underline;
+        }
       }
     }