1 files changed, 12 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index a3a241590..121aa2562 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -782,6 +782,16 @@ sub users: Path('users') : Args(0) {
     } else {
         $c->forward('get_token');
         $c->forward('fetch_all_bodies');
+
+        # Admin users by default
+        my $users = $c->model('DB::User')->search(
+            { from_body => { '!=', undef } },
+            { order_by => 'name' }
+        );
+        my @users = $users->all;
+        my %email2user = map { $_->email => $_ } @users;
+        $c->stash->{users} = \@users;
+
     }
 
     return 1;
@@ -903,6 +913,8 @@ sub user_add : Path('user_edit') : Args(0) {
 
     $c->forward('check_token');
 
+    return unless $c->req->param('name') && $c->req->param('email');
+
     my $user = $c->model('DB::User')->find_or_create( {
         name => $c->req->param('name'),
         email => $c->req->param('email'),