diff --git a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 b/app/assets/javascripts/discourse/components/header-dropdown.js.es6
index 4990aa107a1..07123063382 100644
--- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/header-dropdown.js.es6
@@ -1,7 +1,14 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: [':header-dropdown-toggle', 'active'],
 
+  @computed('showUser')
+  href(showUser) {
+    return showUser ? this.currentUser.get('path') : '';
+  },
+
   active: Ember.computed.alias('toggleVisible'),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 3f5941bc7dc..01aef870afa 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -60,12 +60,6 @@ const User = RestModel.extend({
     return ('background-image: url(' + Discourse.getURLWithCDN(bgUrl) + ')').htmlSafe();
   },
 
-  /**
-    Path to this user.
-
-    @property path
-    @type {String}
-  **/
   path: function(){
     return Discourse.getURL('/users/' + this.get('username_lower'));
     // no need to observe, requires a hard refresh to update
diff --git a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs
index 732e31e06ae..6cb4af742b4 100644
--- a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs
@@ -1,4 +1,4 @@
-<a {{action "toggle"}} class='icon' href title={{i18n title}} aria-label={{i18n title}} id={{iconId}}> 
+<a {{action "toggle"}} class='icon' href={{href}} title={{i18n title}} aria-label={{i18n title}} id={{iconId}}> 
   {{#if showUser}}
     {{bound-avatar currentUser "medium"}}
   {{else}}