4 files changed, 10 insertions, 10 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 0c37eeb27..2f4669456 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -549,10 +549,9 @@ sub report_edit : Path('report_edit') : Args(1) {
         if ( $problem->state ne $old_state ) {
             $c->forward( 'log_edit', [ $id, 'problem', 'state_change' ] );
 
-            my $name = _('an administrator');
+            my $name = $c->user->moderating_user_name;
             my $extra = { is_superuser => 1 };
             if ($c->user->from_body) {
-                $name = $c->user->from_body->name;
                 delete $extra->{is_superuser};
                 $extra->{is_body_user} = $c->user->from_body->id;
             }
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index 0ec6cbb63..22869d531 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -146,11 +146,6 @@ sub check_edited_elsewhere : Private {
     }
 }
 
-sub moderating_user_name {
-    my $user = shift;
-    return $user->from_body ? $user->from_body->name : _('an administrator');
-}
-
 sub moderate_log_entry : Private {
     my ($self, $c, $object_type, @types) = @_;
 
@@ -167,7 +162,7 @@ sub moderate_log_entry : Private {
     $c->model('DB::AdminLog')->create({
         action => 'moderation',
         user => $user,
-        admin_user => moderating_user_name($user),
+        admin_user => $user->moderating_user_name,
         object_id => $c->stash->{history}->id || $object->id,
         object_type => $c->stash->{history}->id ? 'moderation' : $object_type,
         reason => $log_reason,
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index b6292facb..063226f18 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -818,8 +818,9 @@ sub process_user : Private {
         $c->stash->{email} = $report->user->email;
 
         if ($c->stash->{contributing_as_body} or $c->stash->{contributing_as_anonymous_user}) {
-            $report->name($user->from_body->name);
-            $user->name($user->from_body->name) unless $user->name;
+            my $name = $user->moderating_user_name;
+            $report->name($name);
+            $user->name($name) unless $user->name;
             $c->stash->{no_reporter_alert} = 1;
         }
 
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index bf74e6934..546867c34 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -292,6 +292,11 @@ sub body {
     return $self->from_body->name;
 }
 
+sub moderating_user_name {
+    my $self = shift;
+    return $self->body || _('an administrator');
+}
+
 =head2 belongs_to_body
 
     $belongs_to_body = $user->belongs_to_body( $bodies );