diff --git a/app/assets/javascripts/discourse/controllers/user_private_messages_controller.js b/app/assets/javascripts/discourse/controllers/user_private_messages_controller.js
index 6607de7f9e..bcb0a279cc 100644
--- a/app/assets/javascripts/discourse/controllers/user_private_messages_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user_private_messages_controller.js
@@ -7,10 +7,10 @@
   @module Discourse
 **/
 Discourse.UserPrivateMessagesController = Discourse.ObjectController.extend({
+  needs: ['composer'],
 
   composePrivateMessage: function() {
-    var composerController = Discourse.get('router.composerController');
-    return composerController.open({
+    this.get('controllers.composer').open({
       action: Discourse.Composer.PRIVATE_MESSAGE,
       archetypeId: 'private_message',
       draftKey: 'new_private_message'
diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index a3c6f3223a..6e0af1f217 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -166,6 +166,21 @@ Handlebars.registerHelper('avatar', function(user, options) {
   }
 });
 
+/**
+  Bound avatar helper.
+
+  @method boundAvatar
+  @for Handlebars
+**/
+Ember.Handlebars.registerBoundHelper('boundAvatar', function(user, options) {
+  var username = Em.get(user, 'username');
+  return new Handlebars.SafeString(Discourse.Utilities.avatarImg({
+    size: options.hash.imageSize,
+    username: username,
+    avatarTemplate: Ember.get(user, 'avatar_template')
+  }));
+});
+
 /**
   Nicely format a date without a binding since the date doesn't need to change.
 
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 3d522071a7..24e0fdb8a8 100644
--- a/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js
+++ b/app/assets/javascripts/discourse/routes/discourse_restricted_user_route.js
@@ -8,7 +8,8 @@
 **/
 Discourse.RestrictedUserRoute = Discourse.Route.extend({
 
-  redirect: function(user) {
+  redirect: function() {
+    var user = this.modelFor('user');
     if (!user.get('can_edit')) {
       this.transitionTo('user.activity', user);
     }
diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index c29752475e..7394dc109d 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -2,13 +2,13 @@
   <div class="user-heading">
     <div class="container">
       <div class="full-width" id='user-menu'>
-        <h1>{{name}}<span>{{unbound username}}{{{unbound statusIcon}}}</span></h1>
+        <h1>{{name}}<span>{{username}}{{{statusIcon}}}</span></h1>
 
         {{#if viewingSelf}}
           <button {{action "logout" target="Discourse"}} class='btn'>{{i18n user.log_out}}</button>
         {{/if}}
         {{#if currentUser.staff}}
-          <a href="{{unbound adminPath}}" class='btn'><i class="icon-wrench"></i>&nbsp;{{i18n admin.user.show_admin_profile}}</a>
+          <a {{bindAttr href="adminPath"}} class='btn'><i class="icon-wrench"></i>&nbsp;{{i18n admin.user.show_admin_profile}}</a>
         {{/if}}
         <ul class="nav nav-pills">
           <li>
@@ -29,7 +29,7 @@
           {{/if}}
         </ul>
         <div class='avatar-wrapper'>
-          {{avatar model imageSize="120"}}
+          {{boundAvatar model imageSize="120"}}
         </div>
       </div>
     </div>