diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index a3681637b5e..780ee6fb467 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -167,12 +167,9 @@ export default Ember.Component.extend(
         .finally(() => this.set("loading", null));
     },
 
-    didInsertElement() {
-      this._super(...arguments);
-    },
-
     _close() {
       this._super(...arguments);
+
       this.setProperties({
         user: null,
         topicPostCount: null
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 164df0d599d..962f710ab48 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -3,7 +3,7 @@
 
     <div class="card-row first-row">
       <div class="group-card-avatar">
-        <a href {{action "showGroup" group}} class="card-huge-avatar">
+        <a href="{{groupPath}}" {{action "showGroup" group}} class="card-huge-avatar">
           {{avatar-flair
           flairURL=group.flair_url
           flairBgColor=group.flair_bg_color
@@ -14,7 +14,7 @@
       <div class="names">
         <span>
           <h1 class="{{group.name}}">
-            <a href {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
+            <a href="{{groupPath}}" {{action "showGroup" group}} class='group-page-link'>{{group.name}}</a>
           </h1>
           {{#if group.full_name}}
             <h2 class='full-name'>{{group.full_name}}</h2>
@@ -74,7 +74,7 @@
             <a href {{action 'showUser' user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
           {{/each}}
           {{#if showMoreMembers}}
-            <a href {{action "showGroup" group}} class="more-members-link"><span
+            <a href="{{groupPath}}" {{action "showGroup" group}} class="more-members-link"><span
                class="more-members-count">+{{moreMembersCount}}
                 {{i18n "more"}}</span></a>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 71f0adbf8cc..23547472f88 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -6,7 +6,7 @@
         {{#if user.profile_hidden}}
           <span class="card-huge-avatar">{{bound-avatar user "huge"}}</span>
         {{else}}
-          <a href {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
+          <a href="{{user.path}}" {{action "showUser" user}} class="card-huge-avatar">{{bound-avatar user "huge"}}</a>
         {{/if}}
         {{#if user.primary_group_name}}
           {{avatar-flair
@@ -26,7 +26,7 @@
                 {{user-status user currentUser=currentUser}}
               </span>
             {{else}}
-              <a href {{action "showUser" user}} class='user-profile-link'>
+              <a href="{{user.path}}" {{action "showUser" user}} class='user-profile-link'>
                 {{if nameFirst user.name (format-username username)}}
                 {{user-status user currentUser=currentUser}}
               </a>
@@ -221,4 +221,4 @@
     {{/if}}
 
   </div>
-{{/if}}
\ No newline at end of file
+{{/if}}