     if me.showChinaRegistration()
       @country = 'China'
     else
-      if me.get('country') and !!_.find(countries, (c) => c.country is _.string.slugify(me.get('country')))
-        @country = _.string.titleize(_.string.humanize(me.get('country')))
+      userCountry = me.get('country')
+      matchingCountryName = if userCountry then _.find(countryList.getNames(), (c) => c is _.string.slugify(userCountry) or c.toLowerCase() is userCountry.toLowerCase()) else undefined
+      if matchingCountryName
+        @country = matchingCountryName
       else
         @country = 'United States'
 


  components:
    'nces-search-input': NcesSearchInput
    
  methods:
    updateValue: (name, value) ->
      @[name] = value

      NCES_KEYS = if displayKey is 'name' then SCHOOL_NCES_KEYS else DISTRICT_NCES_KEYS
      for key in NCES_KEYS
        @['nces_'+key] = suggestion[key]

    onChangeCountry: ->
      if @['country'] == 'United States' && !@usaStatesAbbreviations.includes(@['state'])
        @['state'] = ''
