Redirect from auth to admin if already logged in on Zurich.

1 files changed, 2 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index f4d6d86e4..aae912ad1 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -31,7 +31,7 @@ sub general : Path : Args(0) {
     my $req = $c->req;
 
     $c->detach( 'redirect_on_signin', [ $req->param('r') ] )
-        if $c->user && $req->param('r') && $req->param('r') !~ /admin/;
+        if $c->user && $req->param('r');
 
     # all done unless we have a form posted to us
     return unless $req->method eq 'POST';
@@ -182,6 +182,7 @@ Used after signing in to take the person back to where they were.
 sub redirect_on_signin : Private {
     my ( $self, $c, $redirect ) = @_;
     $redirect = 'my' unless $redirect;
+    $redirect = 'admin' if $c->cobrand->moniker eq 'zurich' && $c->user->from_body;
     $c->res->redirect( $c->uri_for( "/$redirect" ) );
 }