Always show and send the setup country field (#10514)