Force Login - Behaviour now consistent across whole website