Better handling getting back to admin screen when already logged in
Initial work on #10