Tidy up and add guard to authentication support.
Tidy up and add guard to authentication support.

cyclestreets/cyclescape,auto-mat/toolkit,cyclestreets/cyclescape,auto-mat/toolkit,cyclestreets/cyclescape