Few minor fixes to the login flow.