diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index 7c443cd15..c6d2708ff 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -4,7 +4,7 @@
     <div class='field'>{{i18n user.username.title}}</div>
     <div class='value'>{{username}}</div>
     <div class='controls'>
-      {{#link-to 'userActivity' model class="btn"}}
+      {{#link-to 'user' model class="btn"}}
         <i class='fa fa-user'></i>
         {{i18n admin.user.show_public_profile}}
       {{/link-to}}
diff --git a/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js b/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js
index b1ecdae5d..d489e6f5d 100644
--- a/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js
+++ b/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js
@@ -11,7 +11,7 @@ Discourse.RestrictedUserRoute = Discourse.Route.extend({
   afterModel: function() {
     var user = this.modelFor('user');
     if (!user.get('can_edit')) {
-      this.transitionTo('userActivity');
+      this.replaceWith('userActivity');
     }
   }
 
diff --git a/app/assets/javascripts/discourse/routes/user_index_route.js b/app/assets/javascripts/discourse/routes/user_index_route.js
index 06f874551..17474c41c 100644
--- a/app/assets/javascripts/discourse/routes/user_index_route.js
+++ b/app/assets/javascripts/discourse/routes/user_index_route.js
@@ -8,6 +8,6 @@
 **/
 Discourse.UserIndexRoute = Discourse.UserActivityRoute.extend({
   redirect: function() {
-    this.transitionTo('userActivity', this.modelFor('user'));
+    this.replaceWith('userActivity', this.modelFor('user'));
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
index 551a655fd..a1a300571 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars
@@ -16,7 +16,7 @@
   {{#if userBadges}}
     <div>
     {{#each userBadges}}
-        {{#link-to 'userActivity' user}}
+        {{#link-to 'user' user}}
           <div class="badge-user">
             {{avatar user imageSize="large"}}
             <div class="details">
diff --git a/app/assets/javascripts/discourse/templates/group/members.js.handlebars b/app/assets/javascripts/discourse/templates/group/members.js.handlebars
index 4718563d9..0a0c81719 100644
--- a/app/assets/javascripts/discourse/templates/group/members.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/group/members.js.handlebars
@@ -9,7 +9,7 @@
         {{avatar this imageSize="large"}}
       </td>
       <td>
-        <h3>{{#link-to 'userActivity' this}}{{username}}{{/link-to}}</h3>
+        <h3>{{#link-to 'user' this}}{{username}}{{/link-to}}</h3>
         <p>{{name}}</p>
       </td>
       <td>
diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
index 48d92ea15..ac96c9cb6 100644
--- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
+++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
@@ -37,7 +37,7 @@
         <button class='btn btn-primary' {{action composePrivateMessage user}}><i class='fa fa-envelope'></i>{{i18n user.private_message}}</button>
       {{/if}}
 
-      {{#link-to 'userActivity.index' user class="btn"}}<i class='fa fa-user'></i>{{i18n user.show_profile}}{{/link-to}}
+      {{#link-to 'user' user class="btn"}}<i class='fa fa-user'></i>{{i18n user.show_profile}}{{/link-to}}
 
       {{#if showFilter}}
         <button class='btn' {{action togglePosts user}}><i class='fa fa-filter'></i>{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index 1acd48aac..678f6c306 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -102,7 +102,7 @@
                 <dt>{{i18n user.last_seen}}</dt><dd>{{date last_seen_at}}</dd>
               {{/if}}
               {{#if invited_by}}
-                <dt>{{i18n user.invited_by}}</dt><dd>{{#link-to 'userActivity' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
+                <dt>{{i18n user.invited_by}}</dt><dd>{{#link-to 'user' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
               {{/if}}
               {{#if email}}
                 <dt>{{i18n user.email.title}}</dt><dd {{bind-attr title="email"}}>{{email}}</dd>
diff --git a/app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars b/app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars
index 421abb01d..5046e1bed 100644
--- a/app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars
@@ -1,6 +1,6 @@
 <section class='d-dropdown' id='user-dropdown'>
   <ul class='user-dropdown-links'>
-    <li>{{#link-to 'userActivity' currentUser class="user-activity-link" }}{{i18n user.profile}}{{/link-to}}</li>
+    <li>{{#link-to 'user' currentUser class="user-activity-link" }}{{i18n user.profile}}{{/link-to}}</li>
     {{#if showAdminLinks}}
       <li>{{#link-to 'adminUser' currentUser.username }}{{i18n admin_title}}{{/link-to}}</li>
     {{/if}}