MOB-42 - improvements to login to work against new api.