Fixing signup flow