diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 0eb73f8d95..75f4fd5b73 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -94,11 +94,11 @@
 
               {{#if websiteName}}
                 <i class="fa fa-globe"></i>
-                  {{#if linkWebsite}}
-                    <a {{bind-attr href="website"}} rel="nofollow" target="_blank">{{websiteName}}</a>
-                  {{else}}
-                    <span {{bind-attr title="website"}}>{{websiteName}}</span>
-                  {{/if}}
+                {{#if linkWebsite}}
+                  <a {{bind-attr href="website"}} rel="nofollow" target="_blank">{{websiteName}}</a>
+                {{else}}
+                  <span {{bind-attr title="website"}}>{{websiteName}}</span>
+                {{/if}}
               {{/if}}
 
               </h3>
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 8cbb5dd38b..a889c97026 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -614,11 +614,11 @@ iframe {
   position: relative;
 }
 
-  a.mention {
-    padding: 2px 4px;
-    color: $primary;
-    background: scale-color-diff();
-  }
+a.mention {
+  padding: 2px 4px;
+  color: $primary;
+  background: scale-color-diff();
+}
 
 
 .modal-body {
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 1ffc369d6d..acc129a2bb 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -127,6 +127,9 @@
       max-width: 100%;
     }
 
+    a.mention {
+      background-color: dark-light-diff($secondary, $primary, 50%, -60%);
+    }
     .overflow {
       max-height: 60px;
       overflow: hidden;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 7df2422183..da9d689aee 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -292,6 +292,10 @@
           overflow: auto;
           max-width: 750px;
 
+          a.mention {
+            background-color: dark-light-diff($secondary, $primary, 50%, -60%);
+          }
+
           a[href] {
             color: dark-light-diff($secondary, $primary, 75%, 0%);
             text-decoration: underline;