Fixed login flow