Fix login and uplift xfail
Merge pull request #570 from AndreiH/fix_login

Fix login and uplift xfail