improved the first login flow