Feature: Better signup flow
Fix: some test failures.