Updated signup flow (WIP)