Fix login and uplift xfail