Laying ground for signup flow refactoring
Fix conflict