Reworked account login flow