diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index f12612b45c8..0aceb7d13b4 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -1,11 +1,9 @@
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import computed from 'ember-addons/ember-computed-decorators';
-import UserAction from 'discourse/models/user-action';
 import User from 'discourse/models/user';
 
 export default Ember.Controller.extend(CanCheckEmails, {
   indexStream: false,
-  userActionType: null,
   application: Ember.inject.controller(),
   userNotifications: Ember.inject.controller('user-notifications'),
   currentPath: Ember.computed.alias('application.currentPath'),
@@ -62,18 +60,6 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return Discourse.SiteSettings.enable_badges && badgeCount > 0;
   },
 
-  @computed("userActionType")
-  privateMessageView(userActionType) {
-    return (userActionType === UserAction.TYPES.messages_sent) ||
-           (userActionType === UserAction.TYPES.messages_received);
-  },
-
-  @computed("indexStream", "userActionType")
-  showActionTypeSummary(indexStream,userActionType, showPMs) {
-    return (indexStream || userActionType) && !showPMs;
-  },
-
-
   @computed()
   canInviteToForum() {
     return User.currentProp('can_invite_to_forum');
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
index 926ba744e45..670203bcb27 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
@@ -1,14 +1,5 @@
 import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 
 export default UserActivityStreamRoute.extend({
-  userActionType: undefined,
-
-  actions: {
-    didTransition() {
-      this._super();
-      this.controllerFor("user").set("indexStream", true);
-      return true;
-    }
-  }
-
+  userActionType: null
 });
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6
index 12fe0c929cd..a191c418722 100644
--- a/app/assets/javascripts/discourse/routes/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6
@@ -1,5 +1,11 @@
 export default Discourse.Route.extend({
   model() {
     return this.modelFor("user").summary();
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("user").set("indexStream", true);
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 03bfbb401b0..936ebadfccb 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -1,5 +1,3 @@
-const INDEX_STREAM_ROUTES = ["user.deletedPosts", "user.flaggedPosts", "userActivity.index"];
-
 import Draft from 'discourse/models/draft';
 
 export default Discourse.Route.extend({
@@ -16,7 +14,7 @@ export default Discourse.Route.extend({
     willTransition(transition) {
       // will reset the indexStream when transitioning to routes that aren't "indexStream"
       // otherwise the "header" will jump
-      const isIndexStream = INDEX_STREAM_ROUTES.indexOf(transition.targetName) !== -1;
+      const isIndexStream = transition.targetName === "user.summary";
       this.controllerFor('user').set('indexStream', isIndexStream);
       return true;
     },
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 8546022746a..13f1c6b222c 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -162,6 +162,7 @@
     </section>
 
     {{#mobile-nav class='main-nav' desktopClass="nav nav-pills user-nav" currentPath=currentPath}}
+      <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
       <li>{{#link-to 'userActivity'}}{{i18n 'user.activity_stream'}}{{/link-to}}</li>
       {{#if showNotificationsTab}}
         <li>
@@ -180,7 +181,6 @@
         <li>{{#link-to 'user.badges'}}{{fa-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
       {{/if}}
       {{plugin-outlet name="user-main-nav" connectorTagName='li' args=(hash model=model)}}
-      <li>{{#link-to 'user.summary'}}{{i18n 'user.summary.title'}}{{/link-to}}</li>
       {{#if model.can_edit}}
         <li>{{#link-to 'preferences'}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
       {{/if}}
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6
index 982621cb91a..62e458cea52 100644
--- a/test/javascripts/acceptance/user-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/user-anonymous-test.js.es6
@@ -18,6 +18,7 @@ function hasTopicList() {
 test("Root URL", () => {
   visit("/users/eviltrout");
   andThen(() => {
+    ok($('body.user-summary-page').length, "has the body class");
     equal(currentPath(), 'user.summary', "it defaults to summary");
   });
 });
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index 84fd02aa0b7..0271a9977a9 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -27,7 +27,7 @@ test("Root URL - Viewing Self", () => {
   visit("/users/eviltrout");
   andThen(() => {
     ok($('body.user-activity-page').length, "has the body class");
-    equal(currentPath(), 'user.userActivity.index', "it defaults to summary");
+    equal(currentPath(), 'user.userActivity.index', "it defaults to activity");
     ok(exists('.container.viewing-self'), "has the viewing-self class");
   });
 });