Fixed login flow for login and org spec