Handle countries without legacy account fields