Changed login workflow