diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index e8f2cef7c19..5ca4a2c2ca1 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -1,11 +1 @@
-/**
-  This controller supports all actions on a user's activity stream
-
-  @class UserActivityController
-  @extends Discourse.Controller
-  @namespace Discourse
-  @module Discourse
-**/
-export default Discourse.ObjectController.extend({
-  needs: ['composer']
-});
+export default Ember.ObjectController.extend();
diff --git a/app/assets/javascripts/discourse/initializers/deprecations.js.es6 b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
index 20d15cba1f3..edb80811436 100644
--- a/app/assets/javascripts/discourse/initializers/deprecations.js.es6
+++ b/app/assets/javascripts/discourse/initializers/deprecations.js.es6
@@ -5,7 +5,8 @@ var deprecatedViewHelpers = {
   userSelector: 'user-selector',
   combobox: 'combo-box',
   categoryChooser: 'category-chooser',
-  chooseTopic: 'choose-topic'
+  chooseTopic: 'choose-topic',
+  'discourse-activity-filter': 'activity-filter'
 };
 
 export default {
diff --git a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6 b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
index 1a79d2b3cb1..05ecb44daf7 100644
--- a/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
+++ b/app/assets/javascripts/discourse/initializers/view-helpers.js.es6
@@ -4,7 +4,8 @@ var helpers = ['input-tip',
                'user-selector',
                'category-chooser',
                'combo-box',
-               'choose-topic'];
+               'choose-topic',
+               'activity-filter'];
 
 /**
   Creates view helpers for some views. Many of these should probably be converted
diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index a95f6462b57..63713e09370 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -9,9 +9,9 @@
     <section class='user-navigation'>
 
       <ul class='action-list nav-stacked'>
-        {{discourse-activity-filter count=statsCountNonPM user=model userActionType=userActionType indexStream=indexStream}}
+        {{activity-filter count=statsCountNonPM user=model userActionType=userActionType indexStream=indexStream}}
         {{#each stat in statsExcludingPms}}
-          {{discourse-activity-filter content=stat user=model userActionType=userActionType indexStream=indexStream}}
+          {{activity-filter content=stat user=model userActionType=userActionType indexStream=indexStream}}
         {{/each}}
         {{#if showBadges}}
           {{#link-to 'user.badges' tagName="li"}}
diff --git a/app/assets/javascripts/discourse/views/user/activity_filter_view.js b/app/assets/javascripts/discourse/views/activity-filter.js.es6
similarity index 86%
rename from app/assets/javascripts/discourse/views/user/activity_filter_view.js
rename to app/assets/javascripts/discourse/views/activity-filter.js.es6
index 985e2527967..48c5ea205af 100644
--- a/app/assets/javascripts/discourse/views/user/activity_filter_view.js
+++ b/app/assets/javascripts/discourse/views/activity-filter.js.es6
@@ -1,12 +1,4 @@
-/**
-  This view handles rendering of an activity in a user's profile
-
-  @class ActivityFilterView
-  @extends Ember.Component
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.ActivityFilterView = Ember.Component.extend({
+export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: ['active', 'noGlyph'],
 
@@ -64,7 +56,4 @@ Discourse.ActivityFilterView = Ember.Component.extend({
       case Discourse.UserAction.TYPES.starred: return "star";
     }
   }.property("content.action_type")
-
 });
-
-Discourse.View.registerHelper('discourse-activity-filter', Discourse.ActivityFilterView);
diff --git a/app/assets/javascripts/discourse/views/user/user_stream_view.js b/app/assets/javascripts/discourse/views/user-stream.js.es6
similarity index 65%
rename from app/assets/javascripts/discourse/views/user/user_stream_view.js
rename to app/assets/javascripts/discourse/views/user-stream.js.es6
index d63d4a314f3..ef52176a73e 100644
--- a/app/assets/javascripts/discourse/views/user/user_stream_view.js
+++ b/app/assets/javascripts/discourse/views/user-stream.js.es6
@@ -1,17 +1,14 @@
-/**
-  This view handles rendering of a user's stream
-
-  @class UserStreamView
-  @extends Discourse.View
-  @namespace Discourse
-  @uses Discourse.LoadMore
-  @module Discourse
-**/
-Discourse.UserStreamView = Discourse.View.extend(Discourse.LoadMore, {
+export default Ember.View.extend(Discourse.LoadMore, {
   loading: false,
   eyelineSelector: '.user-stream .item',
   classNames: ['user-stream'],
 
+  _scrollTopOnModelChange: function() {
+    Em.run.schedule('afterRender', function() {
+      $(document).scrollTop(0);
+    });
+  }.observes('controller.model.user.id'),
+
   actions: {
     loadMore: function() {
       var self = this;
diff --git a/app/assets/javascripts/discourse/views/user/user_activity_view.js b/app/assets/javascripts/discourse/views/user/user_activity_view.js
deleted file mode 100644
index c4df3b4fbd5..00000000000
--- a/app/assets/javascripts/discourse/views/user/user_activity_view.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-  This view handles rendering of a user's activity stream
-
-  @class UserActivityView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.UserActivityView = Discourse.View.extend({
-  userBinding: 'controller.content',
-
-  didInsertElement: function() {
-    window.scrollTo(0, 0);
-  }
-
-});
-
-