Changes to login flow