Latest work to make Login a bit less rubbish