beginning of supporting a default country code that doesn't set the field as changed