diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 38b2f10a564..bcb11c85112 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -26,6 +26,7 @@ export default Ember.Controller.extend({
   showBadges: setting('enable_badges'),
   showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
   showDelete: Em.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
+  linkWebsite: Em.computed.not('user.isBasic'),
 
   @computed('user.user_fields.@each.value')
   publicUserFields() {
@@ -40,6 +41,11 @@ export default Ember.Controller.extend({
     }
   },
 
+  @computed("user.trust_level")
+  removeNoFollow(trustLevel) {
+    return trustLevel > 2 && !this.siteSettings.tl3_links_no_follow;
+  },
+
   moreBadgesCount: function() {
     return this.get('user.badge_count') - this.get('user.featured_user_badges.length');
   }.property('user.badge_count', 'user.featured_user_badges.@each'),
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index ecbc84d125a..5c948b62bbe 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -55,6 +55,23 @@
     {{/link-to}}
   {{/if}}
 
+  <div>
+    {{#if user.location}}
+      <span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
+    {{/if}}
+
+    {{#if user.website_name}}
+      <span class='website-name'>
+        {{fa-icon "globe"}}
+        {{#if linkWebsite}}
+          <a href={{user.website}} rel={{unless removeNoFollow 'nofollow'}} target="_blank">{{user.website_name}}</a>
+        {{else}}
+          <span title={{user.website}}>{{user.website_name}}</span>
+        {{/if}}
+      </span>
+    {{/if}}
+  </div>
+
   {{#if user}}
     <div class="metadata">
       {{#if user.last_posted_at}}