Fix #1087 Extended Settings country/state dropdowns

Also fixed a potential issue in the user_meta with the country dropdown
not using the configured name/id.