diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
index ef77954b9..6c494e0e2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
@@ -7,5 +7,5 @@
 {{/if}}
 <button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
 {{#if model.canDeleteAsSpammer}}
-  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
index de5d62b2d..926f81bd2 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
@@ -1,5 +1,5 @@
 <button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
 <button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
 {{#if model.canDeleteAsSpammer}}
-  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 956cbe235..c387e5332 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -122,12 +122,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
     this.fetchUserDetails();
   }.observes('model.username'),
 
-  fetchUserDetails: function() {
-    if( Discourse.User.currentProp('staff') && this.get('model.username') ) {
-      const flagController = this;
-      Discourse.AdminUser.find(this.get('model.username').toLowerCase()).then(function(user){
-        flagController.set('userDetails', user);
-      });
+  fetchUserDetails() {
+    if (Discourse.User.currentProp('staff') && this.get('model.username')) {
+      Discourse.AdminUser.find(this.get('model.username').toLowerCase())
+                         .then(user => this.set('userDetails', user));
     }
   }