Fix #939, #627 sync user_meta state/country selects

Based on submission by @codencer in #939