BZ-12068 Adjust fields collected on registration form