diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6
index 79740356661..be81d645739 100644
--- a/app/assets/javascripts/discourse/routes/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6
@@ -4,6 +4,7 @@ export default Discourse.Route.extend({
   },
 
   setupController: function(controller, user) {
+    this.controllerFor('user-activity').set('model', user);
     this.controllerFor('user').set('pmView', null);
 
     // Bring up a draft
diff --git a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
index 3c80a0855e7..12bb0acdb59 100644
--- a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
+++ b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
@@ -5,11 +5,7 @@ Discourse.UserTopicListRoute = Discourse.Route.extend({
 
   setupController: function(controller, model) {
     this.controllerFor('user').set('indexStream', false);
-    try {
-    this.controllerFor('user_activity').set('userActionType', this.get('userActionType'));
-    } catch (e){
-      /* ROBIN FIX ME: fails on reload of PM */
-    }
+    this.controllerFor('user-activity').set('userActionType', this.get('userActionType'));
     this.controllerFor('user_topics_list').setProperties({
       model: model,
       hideCategory: false,