diff --git a/app/assets/javascripts/admin/templates/flags.js.handlebars b/app/assets/javascripts/admin/templates/flags.js.handlebars
index 320ec0d7fdf..5c1c2a2c2cc 100644
--- a/app/assets/javascripts/admin/templates/flags.js.handlebars
+++ b/app/assets/javascripts/admin/templates/flags.js.handlebars
@@ -28,14 +28,8 @@
               <td class='user'>
                 {{#if flaggedPost.postAuthorFlagged}}
                   {{#if flaggedPost.user}}
-                    {{#with flaggedPost}}
-                      {{#link-to 'adminUser' user}}
-                        {{avatar user imageSize="small"}}
-                      {{/link-to}}
-                      {{#if wasEdited}}
-                        <i class="fa fa-pencil" title="{{i18n admin.flags.was_edited}}"></i>
-                      {{/if}}
-                    {{/with}}
+                    {{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="small"}}{{/link-to}}
+                    {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n admin.flags.was_edited}}"></i>{{/if}}
                   {{/if}}
                 {{/if}}
               </td>
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 12ce28d8f0d..675bc9a35c3 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,10 +1,6 @@
 export function renderAvatar(user, options) {
   options = options || {};
 
-  if (typeof user === 'string') {
-    user = Ember.Handlebars.get(this, user, options);
-  }
-
   if (user) {
     var username = Em.get(user, 'username');
     if (!username) username = Em.get(user, options.usernamePath);
@@ -41,5 +37,8 @@ export function renderAvatar(user, options) {
 }
 
 Handlebars.registerHelper('avatar', function(user, options) {
+  if (typeof user === 'string') {
+    user = Ember.Handlebars.get(this, user, options);
+  }
   return new Handlebars.SafeString(renderAvatar.call(this, user, options.hash));
 });