diff --git a/app/assets/javascripts/discourse/components/badge-card.js.es6 b/app/assets/javascripts/discourse/components/badge-card.js.es6
index b162e982ce3..a5eb0561aaa 100644
--- a/app/assets/javascripts/discourse/components/badge-card.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-card.js.es6
@@ -1,37 +1,14 @@
 import computed from 'ember-addons/ember-computed-decorators';
-import DiscourseURL from 'discourse/lib/url';
 import { sanitize, emojiUnescape } from 'discourse/lib/text';
 
 export default Ember.Component.extend({
   size: 'medium',
-  classNameBindings: [':badge-card', 'size', 'badge.slug', 'navigateOnClick:hyperlink'],
-
-  click(e){
-    if (e.target && e.target.nodeName === "A") {
-      return true;
-    }
-
-    if (!this.get('navigateOnClick')) {
-      return false;
-    }
-
-    var url = this.get('badge.url');
-    const username = this.get('username');
-    if (username) {
-      url = url + "?username=" + encodeURIComponent(username);
-    }
-    DiscourseURL.routeTo(url);
-    return true;
-  },
+  classNameBindings: [':badge-card', 'size', 'badge.slug'],
 
   @computed('count', 'badge.grant_count')
   displayCount(count, grantCount) {
-    if (count == null) {
-      return grantCount;
-    }
-    if (count > 1) {
-      return count;
-    }
+    if (count == null) { return grantCount; }
+    if (count > 1) { return count; }
   },
 
   @computed('size')
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index b30725693b3..08b7c79b5e2 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -10,7 +10,7 @@
           </div>
 
           {{#each bg.badges as |b|}}
-            {{badge-card badge=b navigateOnClick="true"}}
+            {{badge-card badge=b}}
           {{/each}}
         </div>
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 765322dec8f..2a41b366059 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -10,7 +10,7 @@
   </div>
   <div class='badge-info'>
     <div class='badge-info-item'>
-      <h3>{{badge.name}}</h3>
+      <h3><a href={{badge.url}}>{{badge.name}}</a></h3>
       <div class='badge-summary'>{{{summary}}}</div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs
index 860af54a92d..03210567ce3 100644
--- a/app/assets/javascripts/discourse/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badges.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="user-badges" class="user-content user-badges-list"}}
   {{#each sortedBadges as |ub|}}
-    {{badge-card badge=ub.badge count=ub.count navigateOnClick="true" username=username}}
+    {{badge-card badge=ub.badge count=ub.count username=username}}
   {{/each}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 5dfd55a16a2..d3444c62b1f 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -179,7 +179,7 @@
   <div class='top-section badges-section'>
     <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
     {{#each model.badges as |badge|}}
-      {{badge-card badge=badge count=badge.count navigateOnClick="true" username=user.username_lower}}
+      {{badge-card badge=badge count=badge.count username=user.username_lower}}
     {{else}}
       <p>{{i18n "user.summary.no_badges"}}</p>
     {{/each}}