diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index f9c0b3b4c..c3c2aa993 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -33,29 +33,20 @@ require('./steps.scss');
 const DEFAULT_COUNTRY = 'us';
 
 /**
- * Return a list of options to give to frc select
+ * Return a list of options to give to select
  * @param  {object} reactIntl      react-intl, used to localize strings
- * @param  {string} defaultCountry optional string of default country to put at top of list
- * @return {object}                ordered set of county options formatted for frc select
+ * @return {object}                ordered set of county options formatted for select
  */
-const getCountryOptions = (reactIntl, defaultCountry) => {
-    const options = countryData.countryOptions.concat({
-        label: reactIntl.formatMessage({id: 'registration.selectCountry'}),
-        disabled: true,
-        value: ''
-    });
-
-    if (typeof defaultCountry !== 'undefined') {
-        return options.sort((a, b) => {
-            if (a.disabled) return -1;
-            if (b.disabled) return 1;
-            if (a.value === defaultCountry) return -1;
-            if (b.value === defaultCountry) return 1;
-            return 0;
-        });
-    }
-    return options;
-};
+const getCountryOptions = reactIntl => (
+    [
+        {
+            label: reactIntl.formatMessage({id: 'registration.selectCountry'}),
+            disabled: true,
+            value: ''
+        },
+        ...countryData.registrationCountryOptions
+    ]
+);
 
 const NextStepButton = props => (
     <Button
@@ -445,6 +436,13 @@ class DemographicsStep extends React.Component {
         this.setState({otherDisabled: gender !== 'other'});
     }
     handleValidSubmit (formData) {
+        // look up country name using user's country code selection
+        if (formData.countryCode) {
+            const countryInfo = countryData.lookupCountryInfo(formData.countryCode);
+            if (countryInfo) {
+                formData.user.country = countryInfo.name;
+            }
+        }
         return this.props.onNextStep(formData);
     }
     isValidBirthdate (year, month) {
@@ -460,7 +458,7 @@ class DemographicsStep extends React.Component {
         return isValid ? true : this.props.intl.formatMessage({id: 'teacherRegistration.validationAge'});
     }
     render () {
-        const countryOptions = getCountryOptions(this.props.intl, DEFAULT_COUNTRY);
+        const countryOptions = getCountryOptions(this.props.intl);
         return (
             <Slide className="registration-step demographics-step">
                 <h2>
@@ -539,7 +537,7 @@ class DemographicsStep extends React.Component {
                         <Select
                             required
                             label={this.props.intl.formatMessage({id: 'general.country'})}
-                            name="user.country"
+                            name="countryCode"
                             options={countryOptions}
                             value={countryOptions[0].value}
                         />
@@ -948,6 +946,7 @@ class AddressStep extends React.Component {
     render () {
         let stateOptions = countryData.subdivisionOptions[this.state.countryChoice];
         stateOptions = [{}].concat(stateOptions);
+        const countryOptions = getCountryOptions(this.props.intl);
         return (
             <Slide className="registration-step address-step">
                 <h2>
@@ -970,7 +969,7 @@ class AddressStep extends React.Component {
                                 this.props.intl.formatMessage({id: 'general.country'})
                             }
                             name="address.country"
-                            options={getCountryOptions(this.props.intl)}
+                            options={countryOptions}
                             value={this.props.defaultCountry}
                             onChange={this.handleChangeCountry}
                         />
diff --git a/src/lib/country-data.js b/src/lib/country-data.js
index 03da81a71..82b32a33a 100644
--- a/src/lib/country-data.js
+++ b/src/lib/country-data.js
@@ -1,31 +1,1087 @@
 module.exports = {};
-const countries = module.exports.data = require('iso-3166-2').data;
 
-const orderByLabel = (a, b) => {
-    if (a.label < b.label) {
-        return -1;
+// only used to determine the subdivisions/states/provinces within a given country
+const isoCountryRawData = module.exports.data = require('iso-3166-2').data;
+
+// sorted array of countries and their data.
+// This is our main, static country list. Each item is an object with at least:
+// code: two-character iso-3166 country code, used to provide country to other libraries
+// name: the version of the country name that we use in our data everywhere, for consistency
+// display (optional): a different version of the country name to display to users,
+// if different from "name"
+const countryInfo = module.exports.countryInfo = [
+    {
+        name: 'Afghanistan',
+        code: 'af'
+    },
+    {
+        name: 'Aland Islands',
+        display: 'Åland Islands',
+        code: 'ax'
+    },
+    {
+        name: 'Albania',
+        code: 'al'
+    },
+    {
+        name: 'Algeria',
+        code: 'dz'
+    },
+    {
+        name: 'American Samoa',
+        code: 'as'
+    },
+    {
+        name: 'Andorra',
+        code: 'ad'
+    },
+    {
+        name: 'Angola',
+        code: 'ao'
+    },
+    {
+        name: 'Anguilla',
+        code: 'ai'
+    },
+    {
+        name: 'Antarctica',
+        code: 'aq'
+    },
+    {
+        name: 'Antigua and Barbuda',
+        code: 'ag'
+    },
+    {
+        name: 'Argentina',
+        code: 'ar'
+    },
+    {
+        name: 'Armenia',
+        code: 'am'
+    },
+    {
+        name: 'Aruba',
+        code: 'aw'
+    },
+    {
+        name: 'Australia',
+        code: 'au'
+    },
+    {
+        name: 'Austria',
+        code: 'at'
+    },
+    {
+        name: 'Azerbaijan',
+        code: 'az'
+    },
+    {
+        name: 'Bahamas',
+        code: 'bs'
+    },
+    {
+        name: 'Bahrain',
+        code: 'bh'
+    },
+    {
+        name: 'Bangladesh',
+        code: 'bd'
+    },
+    {
+        name: 'Barbados',
+        code: 'bb'
+    },
+    {
+        name: 'Belarus',
+        code: 'by'
+    },
+    {
+        name: 'Belgium',
+        code: 'be'
+    },
+    {
+        name: 'Belize',
+        code: 'bz'
+    },
+    {
+        name: 'Benin',
+        code: 'bj'
+    },
+    {
+        name: 'Bermuda',
+        code: 'bm'
+    },
+    {
+        name: 'Bhutan',
+        code: 'bt'
+    },
+    {
+        name: 'Bolivia',
+        code: 'bo'
+    },
+    {
+        name: 'Bonaire, Sint Eustatius and Saba',
+        code: 'bq'
+    },
+    {
+        name: 'Bosnia and Herzegovina',
+        code: 'ba'
+    },
+    {
+        name: 'Botswana',
+        code: 'bw'
+    },
+    {
+        name: 'Bouvet Island',
+        code: 'bv'
+    },
+    {
+        name: 'Brazil',
+        code: 'br'
+    },
+    {
+        name: 'British Indian Ocean Territory',
+        code: 'io'
+    },
+    {
+        name: 'Brunei',
+        display: 'Brunei Darussalami',
+        code: 'bn'
+    },
+    {
+        name: 'Bulgaria',
+        code: 'bg'
+    },
+    {
+        name: 'Burkina Faso',
+        code: 'bf'
+    },
+    {
+        name: 'Burundi',
+        code: 'bi'
+    },
+    {
+        name: 'Cambodia',
+        code: 'kh'
+    },
+    {
+        name: 'Cameroon',
+        code: 'cm'
+    },
+    {
+        name: 'Canada',
+        code: 'ca'
+    },
+    {
+        name: 'Cape Verde',
+        code: 'cv'
+    },
+    {
+        name: 'Cayman Islands',
+        code: 'ky'
+    },
+    {
+        name: 'Central African Republic',
+        code: 'cf'
+    },
+    {
+        name: 'Chad',
+        code: 'td'
+    },
+    {
+        name: 'Chile',
+        code: 'cl'
+    },
+    {
+        name: 'China',
+        code: 'cn'
+    },
+    {
+        name: 'Christmas Island',
+        code: 'cx'
+    },
+    {
+        name: 'Cocos (Keeling) Islands',
+        code: 'cc'
+    },
+    {
+        name: 'Colombia',
+        code: 'co'
+    },
+    {
+        name: 'Comoros',
+        code: 'km'
+    },
+    {
+        name: 'Congo',
+        code: 'cg'
+    },
+    {
+        name: 'Congo, The Democratic Republic of the',
+        code: 'cd'
+    },
+    {
+        name: 'Cook Islands',
+        code: 'ck'
+    },
+    {
+        name: 'Costa Rica',
+        code: 'cr'
+    },
+    {
+        name: 'Cote d\'Ivoire',
+        display: 'Côte d\'Ivoire',
+        code: 'ci'
+    },
+    {
+        name: 'Croatia',
+        code: 'hr'
+    },
+    {
+        name: 'Cuba',
+        code: 'cu'
+    },
+    {
+        name: 'Curacao',
+        display: 'Curaçao',
+        code: 'cw'
+    },
+    {
+        name: 'Cyprus',
+        code: 'cy'
+    },
+    {
+        name: 'Czech Republic',
+        code: 'cz'
+    },
+    {
+        name: 'Denmark',
+        code: 'dk'
+    },
+    {
+        name: 'Djibouti',
+        code: 'dj'
+    },
+    {
+        name: 'Dominica',
+        code: 'dm'
+    },
+    {
+        name: 'Dominican Republic',
+        code: 'do'
+    },
+    {
+        name: 'Ecuador',
+        code: 'ec'
+    },
+    {
+        name: 'Egypt',
+        code: 'eg'
+    },
+    {
+        name: 'El Salvador',
+        code: 'sv'
+    },
+    {
+        name: 'Equatorial Guinea',
+        code: 'gq'
+    },
+    {
+        name: 'Eritrea',
+        code: 'er'
+    },
+    {
+        name: 'Estonia',
+        code: 'ee'
+    },
+    {
+        name: 'Swaziland',
+        display: 'Eswatini',
+        code: 'sz'
+    },
+    {
+        name: 'Ethiopia',
+        code: 'et'
+    },
+    {
+        name: 'Falkland Islands (Malvinas)',
+        code: 'fk'
+    },
+    {
+        name: 'Faroe Islands',
+        code: 'fo'
+    },
+    {
+        name: 'Fiji',
+        code: 'fj'
+    },
+    {
+        name: 'Finland',
+        code: 'fi'
+    },
+    {
+        name: 'France',
+        code: 'fr'
+    },
+    {
+        name: 'French Guiana',
+        code: 'gf'
+    },
+    {
+        name: 'French Polynesia',
+        code: 'pf'
+    },
+    {
+        name: 'French Southern Territories',
+        code: 'tf'
+    },
+    {
+        name: 'Gabon',
+        code: 'ga'
+    },
+    {
+        name: 'Gambia',
+        code: 'gm'
+    },
+    {
+        name: 'Georgia',
+        code: 'ge'
+    },
+    {
+        name: 'Germany',
+        code: 'de'
+    },
+    {
+        name: 'Ghana',
+        code: 'gh'
+    },
+    {
+        name: 'Gibraltar',
+        code: 'gi'
+    },
+    {
+        name: 'Greece',
+        code: 'gr'
+    },
+    {
+        name: 'Greenland',
+        code: 'gl'
+    },
+    {
+        name: 'Grenada',
+        code: 'gd'
+    },
+    {
+        name: 'Guadeloupe',
+        code: 'gp'
+    },
+    {
+        name: 'Guam',
+        code: 'gu'
+    },
+    {
+        name: 'Guatemala',
+        code: 'gt'
+    },
+    {
+        name: 'Guernsey',
+        code: 'gg'
+    },
+    {
+        name: 'Guinea',
+        code: 'gn'
+    },
+    {
+        name: 'Guinea-Bissau',
+        code: 'gw'
+    },
+    {
+        name: 'Guyana',
+        code: 'gy'
+    },
+    {
+        name: 'Haiti',
+        code: 'ht'
+    },
+    {
+        name: 'Heard Island and McDonald Islands',
+        code: 'hm'
+    },
+    {
+        name: 'Honduras',
+        code: 'hn'
+    },
+    {
+        name: 'Hong Kong',
+        code: 'hk'
+    },
+    {
+        name: 'Hungary',
+        code: 'hu'
+    },
+    {
+        name: 'Iceland',
+        code: 'is'
+    },
+    {
+        name: 'India',
+        code: 'in'
+    },
+    {
+        name: 'Indonesia',
+        code: 'id'
+    },
+    {
+        name: 'Iran',
+        code: 'ir'
+    },
+    {
+        name: 'Iraq',
+        code: 'iq'
+    },
+    {
+        name: 'Ireland',
+        code: 'ie'
+    },
+    {
+        name: 'Isle of Man',
+        code: 'im'
+    },
+    {
+        name: 'Israel',
+        code: 'il'
+    },
+    {
+        name: 'Italy',
+        code: 'it'
+    },
+    {
+        name: 'Jamaica',
+        code: 'jm'
+    },
+    {
+        name: 'Japan',
+        code: 'jp'
+    },
+    {
+        name: 'Jersey',
+        code: 'je'
+    },
+    {
+        name: 'Jordan',
+        code: 'jo'
+    },
+    {
+        name: 'Kazakhstan',
+        code: 'kz'
+    },
+    {
+        name: 'Kenya',
+        code: 'ke'
+    },
+    {
+        name: 'Kiribati',
+        code: 'ki'
+    },
+    {
+        name: 'North Korea',
+        display: 'Korea, Democratic People\'s Republic of',
+        code: 'kp'
+    },
+    {
+        name: 'South Korea',
+        display: 'Korea, Republic of',
+        code: 'kr'
+    },
+    {
+        name: 'Kosovo',
+        code: 'xk'
+    },
+    {
+        name: 'Kuwait',
+        code: 'kw'
+    },
+    {
+        name: 'Kyrgyzstan',
+        code: 'kg'
+    },
+    {
+        name: 'Laos',
+        code: 'la'
+    },
+    {
+        name: 'Latvia',
+        code: 'lv'
+    },
+    {
+        name: 'Lebanon',
+        code: 'lb'
+    },
+    {
+        name: 'Lesotho',
+        code: 'ls'
+    },
+    {
+        name: 'Liberia',
+        code: 'lr'
+    },
+    {
+        name: 'Libya',
+        code: 'ly'
+    },
+    {
+        name: 'Liechtenstein',
+        code: 'li'
+    },
+    {
+        name: 'Lithuania',
+        code: 'lt'
+    },
+    {
+        name: 'Luxembourg',
+        code: 'lu'
+    },
+    {
+        name: 'Macao',
+        code: 'mo'
+    },
+    {
+        name: 'Madagascar',
+        code: 'mg'
+    },
+    {
+        name: 'Malawi',
+        code: 'mw'
+    },
+    {
+        name: 'Malaysia',
+        code: 'my'
+    },
+    {
+        name: 'Maldives',
+        code: 'mv'
+    },
+    {
+        name: 'Mali',
+        code: 'ml'
+    },
+    {
+        name: 'Malta',
+        code: 'mt'
+    },
+    {
+        name: 'Marshall Islands',
+        code: 'mh'
+    },
+    {
+        name: 'Martinique',
+        code: 'mq'
+    },
+    {
+        name: 'Mauritania',
+        code: 'mr'
+    },
+    {
+        name: 'Mauritius',
+        code: 'mu'
+    },
+    {
+        name: 'Mayotte',
+        code: 'yt'
+    },
+    {
+        name: 'Mexico',
+        code: 'mx'
+    },
+    {
+        name: 'Micronesia, Federated States of',
+        code: 'fm'
+    },
+    {
+        name: 'Moldova',
+        code: 'md'
+    },
+    {
+        name: 'Monaco',
+        code: 'mc'
+    },
+    {
+        name: 'Mongolia',
+        code: 'mn'
+    },
+    {
+        name: 'Montenegro',
+        code: 'me'
+    },
+    {
+        name: 'Montserrat',
+        code: 'ms'
+    },
+    {
+        name: 'Morocco',
+        code: 'ma'
+    },
+    {
+        name: 'Mozambique',
+        code: 'mz'
+    },
+    {
+        name: 'Myanmar',
+        code: 'mm'
+    },
+    {
+        name: 'Namibia',
+        code: 'na'
+    },
+    {
+        name: 'Nauru',
+        code: 'nr'
+    },
+    {
+        name: 'Nepal',
+        code: 'np'
+    },
+    {
+        name: 'Netherlands',
+        code: 'nl'
+    },
+    {
+        name: 'Netherlands Antilles',
+        code: 'an'
+    },
+    {
+        name: 'New Caledonia',
+        code: 'nc'
+    },
+    {
+        name: 'New Zealand',
+        code: 'nz'
+    },
+    {
+        name: 'Nicaragua',
+        code: 'ni'
+    },
+    {
+        name: 'Niger',
+        code: 'ne'
+    },
+    {
+        name: 'Nigeria',
+        code: 'ng'
+    },
+    {
+        name: 'Niue',
+        code: 'nu'
+    },
+    {
+        name: 'Norfolk Island',
+        code: 'nf'
+    },
+    {
+        name: 'Macedonia, The Former Yugoslav Republic of',
+        display: 'North Macedonia',
+        code: 'mk'
+    },
+    {
+        name: 'Northern Mariana Islands',
+        code: 'mp'
+    },
+    {
+        name: 'Norway',
+        code: 'no'
+    },
+    {
+        name: 'Oman',
+        code: 'om'
+    },
+    {
+        name: 'Pakistan',
+        code: 'pk'
+    },
+    {
+        name: 'Palau',
+        code: 'pw'
+    },
+    {
+        name: 'Palestine, State of',
+        code: 'ps'
+    },
+    {
+        name: 'Panama',
+        code: 'pa'
+    },
+    {
+        name: 'Papua New Guinea',
+        code: 'pg'
+    },
+    {
+        name: 'Paraguay',
+        code: 'py'
+    },
+    {
+        name: 'Peru',
+        code: 'pe'
+    },
+    {
+        name: 'Philippines',
+        code: 'ph'
+    },
+    {
+        name: 'Pitcairn',
+        code: 'pn'
+    },
+    {
+        name: 'Poland',
+        code: 'pl'
+    },
+    {
+        name: 'Portugal',
+        code: 'pt'
+    },
+    {
+        name: 'Puerto Rico',
+        code: 'pr'
+    },
+    {
+        name: 'Qatar',
+        code: 'qa'
+    },
+    {
+        name: 'Reunion',
+        code: 're'
+    },
+    {
+        name: 'Romania',
+        code: 'ro'
+    },
+    {
+        name: 'Russia',
+        code: 'ru'
+    },
+    {
+        name: 'Rwanda',
+        code: 'rw'
+    },
+    {
+        name: 'Saint Barthelemy',
+        display: 'Saint Barthélemy',
+        code: 'bl'
+    },
+    {
+        name: 'Saint Helena',
+        display: 'Saint Helena, Ascension and Tristan Da Cunha',
+        code: 'sh'
+    },
+    {
+        name: 'Saint Kitts and Nevis',
+        code: 'kn'
+    },
+    {
+        name: 'Saint Lucia',
+        code: 'lc'
+    },
+    {
+        name: 'Saint Martin',
+        code: 'mf'
+    },
+    {
+        name: 'Saint Pierre and Miquelon',
+        code: 'pm'
+    },
+    {
+        name: 'Saint Vincent and the Grenadines',
+        code: 'vc'
+    },
+    {
+        name: 'Samoa',
+        code: 'ws'
+    },
+    {
+        name: 'San Marino',
+        code: 'sm'
+    },
+    {
+        name: 'Sao Tome and Principe',
+        code: 'st'
+    },
+    {
+        name: 'Saudi Arabia',
+        code: 'sa'
+    },
+    {
+        name: 'Senegal',
+        code: 'sn'
+    },
+    {
+        name: 'Serbia',
+        code: 'rs'
+    },
+    {
+        name: 'Seychelles',
+        code: 'sc'
+    },
+    {
+        name: 'Sierra Leone',
+        code: 'sl'
+    },
+    {
+        name: 'Singapore',
+        code: 'sg'
+    },
+    {
+        name: 'Sint Maarten',
+        code: 'sx'
+    },
+    {
+        name: 'Slovakia',
+        code: 'sk'
+    },
+    {
+        name: 'Slovenia',
+        code: 'si'
+    },
+    {
+        name: 'Solomon Islands',
+        code: 'sb'
+    },
+    {
+        name: 'Somalia',
+        code: 'so'
+    },
+    {
+        name: 'South Africa',
+        code: 'za'
+    },
+    {
+        name: 'South Georgia and the South Sandwich Islands',
+        code: 'gs'
+    },
+    {
+        name: 'South Sudan',
+        code: 'ss'
+    },
+    {
+        name: 'Spain',
+        code: 'es'
+    },
+    {
+        name: 'Sri Lanka',
+        code: 'lk'
+    },
+    {
+        name: 'Sudan',
+        code: 'sd'
+    },
+    {
+        name: 'Suriname',
+        code: 'sr'
+    },
+    {
+        name: 'Svalbard and Jan Mayen',
+        code: 'sj'
+    },
+    {
+        name: 'Sweden',
+        code: 'se'
+    },
+    {
+        name: 'Switzerland',
+        code: 'ch'
+    },
+    {
+        name: 'Syria',
+        code: 'sy'
+    },
+    {
+        name: 'Taiwan',
+        code: 'tw'
+    },
+    {
+        name: 'Tajikistan',
+        code: 'tj'
+    },
+    {
+        name: 'Tanzania',
+        code: 'tz'
+    },
+    {
+        name: 'Thailand',
+        code: 'th'
+    },
+    {
+        name: 'Timor-Leste',
+        code: 'tl'
+    },
+    {
+        name: 'Togo',
+        code: 'tg'
+    },
+    {
+        name: 'Tokelau',
+        code: 'tk'
+    },
+    {
+        name: 'Tonga',
+        code: 'to'
+    },
+    {
+        name: 'Trinidad and Tobago',
+        code: 'tt'
+    },
+    {
+        name: 'Tunisia',
+        code: 'tn'
+    },
+    {
+        name: 'Turkey',
+        code: 'tr'
+    },
+    {
+        name: 'Turkmenistan',
+        code: 'tm'
+    },
+    {
+        name: 'Turks and Caicos Islands',
+        code: 'tc'
+    },
+    {
+        name: 'Tuvalu',
+        code: 'tv'
+    },
+    {
+        name: 'Uganda',
+        code: 'ug'
+    },
+    {
+        name: 'Ukraine',
+        code: 'ua'
+    },
+    {
+        name: 'United Arab Emirates',
+        code: 'ae'
+    },
+    {
+        name: 'United Kingdom',
+        code: 'gb'
+    },
+    {
+        name: 'United States',
+        display: 'United States of America',
+        code: 'us'
+    },
+    {
+        name: 'United States Minor Outlying Islands',
+        code: 'um'
+    },
+    {
+        name: 'Uruguay',
+        code: 'uy'
+    },
+    {
+        name: 'Uzbekistan',
+        code: 'uz'
+    },
+    {
+        name: 'Vanuatu',
+        code: 'vu'
+    },
+    {
+        name: 'Vatican City',
+        code: 'va'
+    },
+    {
+        name: 'Venezuela',
+        code: 've'
+    },
+    {
+        name: 'Vietnam',
+        code: 'vn'
+    },
+    {
+        name: 'Virgin Islands, British',
+        code: 'vg'
+    },
+    {
+        name: 'Virgin Islands, U.S.',
+        code: 'vi'
+    },
+    {
+        name: 'Wallis and Futuna',
+        code: 'wf'
+    },
+    {
+        name: 'Western Sahara',
+        code: 'eh'
+    },
+    {
+        name: 'Yemen',
+        code: 'ye'
+    },
+    {
+        name: 'Zambia',
+        code: 'zm'
+    },
+    {
+        name: 'Zimbabwe',
+        code: 'zw'
     }
-    return 1;
-};
+];
 
-/**
- * countryOptions is an array like:
- * [
- *    {'value': 'af', 'label': 'Afghanistan'},
- *    {'value': 'ad', 'label': 'Andorra'},
- *    ...
- * ]
- */
-module.exports.countryOptions =
-    Object.keys(countries).map(code => (
+const countryOptions = module.exports.countryOptions = (startingCountryInfo, valueField) => (
+    startingCountryInfo.map(thisCountryInfo => (
         {
-            value: code.toLowerCase(),
-            label: countries[code].name
+            value: thisCountryInfo[valueField],
+            label: thisCountryInfo.display ? thisCountryInfo.display : thisCountryInfo.name
         }
     ))
-        .sort(orderByLabel);
+);
 
-/* subdivisionOptions is an array like:
+module.exports.lookupCountryInfo = countryCode => (
+    countryInfo.find(country => country.code === countryCode)
+);
+
+/**
+ * Function dupeCommonCountries():
+ * takes startingCountryInfo, and duplicates any number of its country labels
+ * at the beginning of the array.
+ * E.g., to have "Germany" and "Italy" at the top of the list, use:
+ *     dupeCommonCountries(['de', 'it')
+ * @param {array} startingCountryInfo array of country objects
+ *     like [{value: 'ca', label: 'Canada'}, ...]
+ * @param {array} commonCountryCodes array of country codes we should duplicate
+ * @returns {array} revised array of country objects, with duplicates inserted at beginning
+ */
+const dupeCommonCountries = module.exports.dupeCommonCountries = (startingCountryInfo, commonCountryCodes) => {
+    const newCountryInfo = startingCountryInfo.map(item => ({...item}));
+    commonCountryCodes.reverse().forEach(commonCountryCode => {
+        const existing = newCountryInfo
+            .find(country => country.code === commonCountryCode.toLowerCase());
+        if (existing) newCountryInfo.unshift(existing);
+    });
+    return newCountryInfo;
+};
+
+/*
+ * registrationCountryOptions is the result of taking the standard countryInfo,
+ * and duplicating 'United States of America' and 'United Kingdom' at the top of the list.
+ * The result is an array like:
+ * [
+ *    {code: 'us', name: 'United States', display: 'United States of America'},
+ *    {code: 'gb', name: 'United Kingdom'},
+ *    {code: 'af', name: 'Afghanistan'},
+ *    ...
+ *    {code: 'ae', name: 'United Arab Emirates'},
+ *    {code: 'us', name: 'United States', display: 'United States of America'},
+ *    {code: 'gb', name: 'United Kingdom'},
+ *    {code: 'uz', name: 'Uzbekistan'},
+ *    ...
+ *    {code: 'zm', name: 'Zimbabwe'}
+ * ]
+ */
+module.exports.registrationCountryOptions =
+    countryOptions(dupeCommonCountries(countryInfo, ['us', 'gb']), 'code');
+
+/* subdivisionOptions uses iso-3166 data to produce an array like:
  * [
  *    {'ad':
  *       [
@@ -45,11 +1101,11 @@ module.exports.countryOptions =
  *    ...
  * ]
  */
-module.exports.subdivisionOptions = Object.keys(countries).reduce((subByCountry, code) => {
-    subByCountry[code.toLowerCase()] = Object.keys(countries[code].sub).map(subCode => ({
+module.exports.subdivisionOptions = Object.keys(isoCountryRawData).reduce((subByCountry, code) => {
+    subByCountry[code.toLowerCase()] = Object.keys(isoCountryRawData[code].sub).map(subCode => ({
         value: subCode.toLowerCase(),
-        label: countries[code].sub[subCode].name,
-        type: countries[code].sub[subCode].type
+        label: isoCountryRawData[code].sub[subCode].name,
+        type: isoCountryRawData[code].sub[subCode].type
     }))
         .sort((a, b) => {
             if (a.label < b.label) {
diff --git a/src/lib/country-list.js b/src/lib/country-list.js
deleted file mode 100644
index 1281f5ed3..000000000
--- a/src/lib/country-list.js
+++ /dev/null
@@ -1,1069 +0,0 @@
-module.exports = {};
-
-const countryInfo = module.exports.countryInfo = [
-    {
-        name: 'Afghanistan',
-        code: 'af'
-    },
-    {
-        name: 'Aland Islands',
-        display: 'Åland Islands',
-        code: 'ax'
-    },
-    {
-        name: 'Albania',
-        code: 'al'
-    },
-    {
-        name: 'Algeria',
-        code: 'dz'
-    },
-    {
-        name: 'American Samoa',
-        code: 'as'
-    },
-    {
-        name: 'Andorra',
-        code: 'ad'
-    },
-    {
-        name: 'Angola',
-        code: 'ao'
-    },
-    {
-        name: 'Anguilla',
-        code: 'ai'
-    },
-    {
-        name: 'Antarctica',
-        code: 'aq'
-    },
-    {
-        name: 'Antigua and Barbuda',
-        code: 'ag'
-    },
-    {
-        name: 'Argentina',
-        code: 'ar'
-    },
-    {
-        name: 'Armenia',
-        code: 'am'
-    },
-    {
-        name: 'Aruba',
-        code: 'aw'
-    },
-    {
-        name: 'Australia',
-        code: 'au'
-    },
-    {
-        name: 'Austria',
-        code: 'at'
-    },
-    {
-        name: 'Azerbaijan',
-        code: 'az'
-    },
-    {
-        name: 'Bahamas',
-        code: 'bs'
-    },
-    {
-        name: 'Bahrain',
-        code: 'bh'
-    },
-    {
-        name: 'Bangladesh',
-        code: 'bd'
-    },
-    {
-        name: 'Barbados',
-        code: 'bb'
-    },
-    {
-        name: 'Belarus',
-        code: 'by'
-    },
-    {
-        name: 'Belgium',
-        code: 'be'
-    },
-    {
-        name: 'Belize',
-        code: 'bz'
-    },
-    {
-        name: 'Benin',
-        code: 'bj'
-    },
-    {
-        name: 'Bermuda',
-        code: 'bm'
-    },
-    {
-        name: 'Bhutan',
-        code: 'bt'
-    },
-    {
-        name: 'Bolivia',
-        code: 'bo'
-    },
-    {
-        name: 'Bonaire, Sint Eustatius and Saba',
-        code: 'bq'
-    },
-    {
-        name: 'Bosnia and Herzegovina',
-        code: 'ba'
-    },
-    {
-        name: 'Botswana',
-        code: 'bw'
-    },
-    {
-        name: 'Bouvet Island',
-        code: 'bv'
-    },
-    {
-        name: 'Brazil',
-        code: 'br'
-    },
-    {
-        name: 'British Indian Ocean Territory',
-        code: 'io'
-    },
-    {
-        name: 'Brunei',
-        display: 'Brunei Darussalami',
-        code: 'bn'
-    },
-    {
-        name: 'Bulgaria',
-        code: 'bg'
-    },
-    {
-        name: 'Burkina Faso',
-        code: 'bf'
-    },
-    {
-        name: 'Burundi',
-        code: 'bi'
-    },
-    {
-        name: 'Cambodia',
-        code: 'kh'
-    },
-    {
-        name: 'Cameroon',
-        code: 'cm'
-    },
-    {
-        name: 'Canada',
-        code: 'ca'
-    },
-    {
-        name: 'Cape Verde',
-        code: 'cv'
-    },
-    {
-        name: 'Cayman Islands',
-        code: 'ky'
-    },
-    {
-        name: 'Central African Republic',
-        code: 'cf'
-    },
-    {
-        name: 'Chad',
-        code: 'td'
-    },
-    {
-        name: 'Chile',
-        code: 'cl'
-    },
-    {
-        name: 'China',
-        code: 'cn'
-    },
-    {
-        name: 'Christmas Island',
-        code: 'cx'
-    },
-    {
-        name: 'Cocos (Keeling) Islands',
-        code: 'cc'
-    },
-    {
-        name: 'Colombia',
-        code: 'co'
-    },
-    {
-        name: 'Comoros',
-        code: 'km'
-    },
-    {
-        name: 'Congo',
-        code: 'cg'
-    },
-    {
-        name: 'Congo, The Democratic Republic of the',
-        code: 'cd'
-    },
-    {
-        name: 'Cook Islands',
-        code: 'ck'
-    },
-    {
-        name: 'Costa Rica',
-        code: 'cr'
-    },
-    {
-        name: 'Cote d\'Ivoire',
-        display: 'Côte d\'Ivoire',
-        code: 'ci'
-    },
-    {
-        name: 'Croatia',
-        code: 'hr'
-    },
-    {
-        name: 'Cuba',
-        code: 'cu'
-    },
-    {
-        name: 'Curacao',
-        display: 'Curaçao',
-        code: 'cw'
-    },
-    {
-        name: 'Cyprus',
-        code: 'cy'
-    },
-    {
-        name: 'Czech Republic',
-        code: 'cz'
-    },
-    {
-        name: 'Denmark',
-        code: 'dk'
-    },
-    {
-        name: 'Djibouti',
-        code: 'dj'
-    },
-    {
-        name: 'Dominica',
-        code: 'dm'
-    },
-    {
-        name: 'Dominican Republic',
-        code: 'do'
-    },
-    {
-        name: 'Ecuador',
-        code: 'ec'
-    },
-    {
-        name: 'Egypt',
-        code: 'eg'
-    },
-    {
-        name: 'El Salvador',
-        code: 'sv'
-    },
-    {
-        name: 'Equatorial Guinea',
-        code: 'gq'
-    },
-    {
-        name: 'Eritrea',
-        code: 'er'
-    },
-    {
-        name: 'Estonia',
-        code: 'ee'
-    },
-    {
-        name: 'Ethiopia',
-        code: 'et'
-    },
-    {
-        name: 'Falkland Islands (Malvinas)',
-        code: 'fk'
-    },
-    {
-        name: 'Faroe Islands',
-        code: 'fo'
-    },
-    {
-        name: 'Fiji',
-        code: 'fj'
-    },
-    {
-        name: 'Finland',
-        code: 'fi'
-    },
-    {
-        name: 'France',
-        code: 'fr'
-    },
-    {
-        name: 'French Guiana',
-        code: 'gf'
-    },
-    {
-        name: 'French Polynesia',
-        code: 'pf'
-    },
-    {
-        name: 'French Southern Territories',
-        code: 'tf'
-    },
-    {
-        name: 'Gabon',
-        code: 'ga'
-    },
-    {
-        name: 'Gambia',
-        code: 'gm'
-    },
-    {
-        name: 'Georgia',
-        code: 'ge'
-    },
-    {
-        name: 'Germany',
-        code: 'de'
-    },
-    {
-        name: 'Ghana',
-        code: 'gh'
-    },
-    {
-        name: 'Gibraltar',
-        code: 'gi'
-    },
-    {
-        name: 'Greece',
-        code: 'gr'
-    },
-    {
-        name: 'Greenland',
-        code: 'gl'
-    },
-    {
-        name: 'Grenada',
-        code: 'gd'
-    },
-    {
-        name: 'Guadeloupe',
-        code: 'gp'
-    },
-    {
-        name: 'Guam',
-        code: 'gu'
-    },
-    {
-        name: 'Guatemala',
-        code: 'gt'
-    },
-    {
-        name: 'Guernsey',
-        code: 'gg'
-    },
-    {
-        name: 'Guinea',
-        code: 'gn'
-    },
-    {
-        name: 'Guinea-Bissau',
-        code: 'gw'
-    },
-    {
-        name: 'Guyana',
-        code: 'gy'
-    },
-    {
-        name: 'Haiti',
-        code: 'ht'
-    },
-    {
-        name: 'Heard Island and McDonald Islands',
-        code: 'hm'
-    },
-    {
-        name: 'Honduras',
-        code: 'hn'
-    },
-    {
-        name: 'Hong Kong',
-        code: 'hk'
-    },
-    {
-        name: 'Hungary',
-        code: 'hu'
-    },
-    {
-        name: 'Iceland',
-        code: 'is'
-    },
-    {
-        name: 'India',
-        code: 'in'
-    },
-    {
-        name: 'Indonesia',
-        code: 'id'
-    },
-    {
-        name: 'Iran',
-        code: 'ir'
-    },
-    {
-        name: 'Iraq',
-        code: 'iq'
-    },
-    {
-        name: 'Ireland',
-        code: 'ie'
-    },
-    {
-        name: 'Isle of Man',
-        code: 'im'
-    },
-    {
-        name: 'Israel',
-        code: 'il'
-    },
-    {
-        name: 'Italy',
-        code: 'it'
-    },
-    {
-        name: 'Jamaica',
-        code: 'jm'
-    },
-    {
-        name: 'Japan',
-        code: 'jp'
-    },
-    {
-        name: 'Jersey',
-        code: 'je'
-    },
-    {
-        name: 'Jordan',
-        code: 'jo'
-    },
-    {
-        name: 'Kazakhstan',
-        code: 'kz'
-    },
-    {
-        name: 'Kenya',
-        code: 'ke'
-    },
-    {
-        name: 'Kiribati',
-        code: 'ki'
-    },
-    {
-        name: 'North Korea',
-        display: 'Korea, Democratic People\'s Republic of',
-        code: 'kp'
-    },
-    {
-        name: 'South Korea',
-        display: 'Korea, Republic of',
-        code: 'kr'
-    },
-    {
-        name: 'Kosovo',
-        code: 'xk'
-    },
-    {
-        name: 'Kuwait',
-        code: 'kw'
-    },
-    {
-        name: 'Kyrgyzstan',
-        code: 'kg'
-    },
-    {
-        name: 'Laos',
-        code: 'la'
-    },
-    {
-        name: 'Latvia',
-        code: 'lv'
-    },
-    {
-        name: 'Lebanon',
-        code: 'lb'
-    },
-    {
-        name: 'Lesotho',
-        code: 'ls'
-    },
-    {
-        name: 'Liberia',
-        code: 'lr'
-    },
-    {
-        name: 'Libya',
-        code: 'ly'
-    },
-    {
-        name: 'Liechtenstein',
-        code: 'li'
-    },
-    {
-        name: 'Lithuania',
-        code: 'lt'
-    },
-    {
-        name: 'Luxembourg',
-        code: 'lu'
-    },
-    {
-        name: 'Macao',
-        code: 'mo'
-    },
-    {
-        name: 'Madagascar',
-        code: 'mg'
-    },
-    {
-        name: 'Malawi',
-        code: 'mw'
-    },
-    {
-        name: 'Malaysia',
-        code: 'my'
-    },
-    {
-        name: 'Maldives',
-        code: 'mv'
-    },
-    {
-        name: 'Mali',
-        code: 'ml'
-    },
-    {
-        name: 'Malta',
-        code: 'mt'
-    },
-    {
-        name: 'Marshall Islands',
-        code: 'mh'
-    },
-    {
-        name: 'Martinique',
-        code: 'mq'
-    },
-    {
-        name: 'Mauritania',
-        code: 'mr'
-    },
-    {
-        name: 'Mauritius',
-        code: 'mu'
-    },
-    {
-        name: 'Mayotte',
-        code: 'yt'
-    },
-    {
-        name: 'Mexico',
-        code: 'mx'
-    },
-    {
-        name: 'Micronesia, Federated States of',
-        code: 'fm'
-    },
-    {
-        name: 'Moldova',
-        code: 'md'
-    },
-    {
-        name: 'Monaco',
-        code: 'mc'
-    },
-    {
-        name: 'Mongolia',
-        code: 'mn'
-    },
-    {
-        name: 'Montenegro',
-        code: 'me'
-    },
-    {
-        name: 'Montserrat',
-        code: 'ms'
-    },
-    {
-        name: 'Morocco',
-        code: 'ma'
-    },
-    {
-        name: 'Mozambique',
-        code: 'mz'
-    },
-    {
-        name: 'Myanmar',
-        code: 'mm'
-    },
-    {
-        name: 'Namibia',
-        code: 'na'
-    },
-    {
-        name: 'Nauru',
-        code: 'nr'
-    },
-    {
-        name: 'Nepal',
-        code: 'np'
-    },
-    {
-        name: 'Netherlands',
-        code: 'nl'
-    },
-    {
-        name: 'Netherlands Antilles',
-        code: 'an'
-    },
-    {
-        name: 'New Caledonia',
-        code: 'nc'
-    },
-    {
-        name: 'New Zealand',
-        code: 'nz'
-    },
-    {
-        name: 'Nicaragua',
-        code: 'ni'
-    },
-    {
-        name: 'Niger',
-        code: 'ne'
-    },
-    {
-        name: 'Nigeria',
-        code: 'ng'
-    },
-    {
-        name: 'Niue',
-        code: 'nu'
-    },
-    {
-        name: 'Norfolk Island',
-        code: 'nf'
-    },
-    {
-        name: 'Macedonia, The Former Yugoslav Republic of',
-        display: 'North Macedonia',
-        code: 'mk'
-    },
-    {
-        name: 'Northern Mariana Islands',
-        code: 'mp'
-    },
-    {
-        name: 'Norway',
-        code: 'no'
-    },
-    {
-        name: 'Oman',
-        code: 'om'
-    },
-    {
-        name: 'Pakistan',
-        code: 'pk'
-    },
-    {
-        name: 'Palau',
-        code: 'pw'
-    },
-    {
-        name: 'Palestine, State of',
-        code: 'ps'
-    },
-    {
-        name: 'Panama',
-        code: 'pa'
-    },
-    {
-        name: 'Papua New Guinea',
-        code: 'pg'
-    },
-    {
-        name: 'Paraguay',
-        code: 'py'
-    },
-    {
-        name: 'Peru',
-        code: 'pe'
-    },
-    {
-        name: 'Philippines',
-        code: 'ph'
-    },
-    {
-        name: 'Pitcairn',
-        code: 'pn'
-    },
-    {
-        name: 'Poland',
-        code: 'pl'
-    },
-    {
-        name: 'Portugal',
-        code: 'pt'
-    },
-    {
-        name: 'Puerto Rico',
-        code: 'pr'
-    },
-    {
-        name: 'Qatar',
-        code: 'qa'
-    },
-    {
-        name: 'Reunion',
-        code: 're'
-    },
-    {
-        name: 'Romania',
-        code: 'ro'
-    },
-    {
-        name: 'Russia',
-        code: 'ru'
-    },
-    {
-        name: 'Rwanda',
-        code: 'rw'
-    },
-    {
-        name: 'Saint Barthelemy',
-        display: 'Saint Barthélemy',
-        code: 'bl'
-    },
-    {
-        name: 'Saint Helena',
-        display: 'Saint Helena, Ascension and Tristan Da Cunha',
-        code: 'sh'
-    },
-    {
-        name: 'Saint Kitts and Nevis',
-        code: 'kn'
-    },
-    {
-        name: 'Saint Lucia',
-        code: 'lc'
-    },
-    {
-        name: 'Saint Martin',
-        code: 'mf'
-    },
-    {
-        name: 'Saint Pierre and Miquelon',
-        code: 'pm'
-    },
-    {
-        name: 'Saint Vincent and the Grenadines',
-        code: 'vc'
-    },
-    {
-        name: 'Samoa',
-        code: 'ws'
-    },
-    {
-        name: 'San Marino',
-        code: 'sm'
-    },
-    {
-        name: 'Sao Tome and Principe',
-        code: 'st'
-    },
-    {
-        name: 'Saudi Arabia',
-        code: 'sa'
-    },
-    {
-        name: 'Senegal',
-        code: 'sn'
-    },
-    {
-        name: 'Serbia',
-        code: 'rs'
-    },
-    {
-        name: 'Seychelles',
-        code: 'sc'
-    },
-    {
-        name: 'Sierra Leone',
-        code: 'sl'
-    },
-    {
-        name: 'Singapore',
-        code: 'sg'
-    },
-    {
-        name: 'Sint Maarten',
-        code: 'sx'
-    },
-    {
-        name: 'Slovakia',
-        code: 'sk'
-    },
-    {
-        name: 'Slovenia',
-        code: 'si'
-    },
-    {
-        name: 'Solomon Islands',
-        code: 'sb'
-    },
-    {
-        name: 'Somalia',
-        code: 'so'
-    },
-    {
-        name: 'South Africa',
-        code: 'za'
-    },
-    {
-        name: 'South Georgia and the South Sandwich Islands',
-        code: 'gs'
-    },
-    {
-        name: 'South Sudan',
-        code: 'ss'
-    },
-    {
-        name: 'Spain',
-        code: 'es'
-    },
-    {
-        name: 'Sri Lanka',
-        code: 'lk'
-    },
-    {
-        name: 'Sudan',
-        code: 'sd'
-    },
-    {
-        name: 'Suriname',
-        code: 'sr'
-    },
-    {
-        name: 'Svalbard and Jan Mayen',
-        code: 'sj'
-    },
-    {
-        name: 'Swaziland',
-        display: 'Eswatini',
-        code: 'sz'
-    },
-    {
-        name: 'Sweden',
-        code: 'se'
-    },
-    {
-        name: 'Switzerland',
-        code: 'ch'
-    },
-    {
-        name: 'Syria',
-        code: 'sy'
-    },
-    {
-        name: 'Taiwan',
-        code: 'tw'
-    },
-    {
-        name: 'Tajikistan',
-        code: 'tj'
-    },
-    {
-        name: 'Tanzania',
-        code: 'tz'
-    },
-    {
-        name: 'Thailand',
-        code: 'th'
-    },
-    {
-        name: 'Timor-Leste',
-        code: 'tl'
-    },
-    {
-        name: 'Togo',
-        code: 'tg'
-    },
-    {
-        name: 'Tokelau',
-        code: 'tk'
-    },
-    {
-        name: 'Tonga',
-        code: 'to'
-    },
-    {
-        name: 'Trinidad and Tobago',
-        code: 'tt'
-    },
-    {
-        name: 'Tunisia',
-        code: 'tn'
-    },
-    {
-        name: 'Turkey',
-        code: 'tr'
-    },
-    {
-        name: 'Turkmenistan',
-        code: 'tm'
-    },
-    {
-        name: 'Turks and Caicos Islands',
-        code: 'tc'
-    },
-    {
-        name: 'Tuvalu',
-        code: 'tv'
-    },
-    {
-        name: 'Uganda',
-        code: 'ug'
-    },
-    {
-        name: 'Ukraine',
-        code: 'ua'
-    },
-    {
-        name: 'United Arab Emirates',
-        code: 'ae'
-    },
-    {
-        name: 'United Kingdom',
-        code: 'gb'
-    },
-    {
-        name: 'United States',
-        display: 'United States of America',
-        code: 'us'
-    },
-    {
-        name: 'United States Minor Outlying Islands',
-        code: 'um'
-    },
-    {
-        name: 'Uruguay',
-        code: 'uy'
-    },
-    {
-        name: 'Uzbekistan',
-        code: 'uz'
-    },
-    {
-        name: 'Vanuatu',
-        code: 'vu'
-    },
-    {
-        name: 'Vatican City',
-        code: 'va'
-    },
-    {
-        name: 'Venezuela',
-        code: 've'
-    },
-    {
-        name: 'Vietnam',
-        code: 'vn'
-    },
-    {
-        name: 'Virgin Islands, British',
-        code: 'vg'
-    },
-    {
-        name: 'Virgin Islands, U.S.',
-        code: 'vi'
-    },
-    {
-        name: 'Wallis and Futuna',
-        code: 'wf'
-    },
-    {
-        name: 'Western Sahara',
-        code: 'eh'
-    },
-    {
-        name: 'Yemen',
-        code: 'ye'
-    },
-    {
-        name: 'Zambia',
-        code: 'zm'
-    },
-    {
-        name: 'Zimbabwe',
-        code: 'zw'
-    }
-];
-
-const countryOptions = module.exports.countryOptions = (startingCountryInfo, valueField) => (
-    startingCountryInfo.map(thisCountryInfo => (
-        {
-            value: thisCountryInfo[valueField],
-            label: thisCountryInfo.display ? thisCountryInfo.display : thisCountryInfo.name
-        }
-    ))
-);
-
-/**
- * Function dupeCommonCountries():
- * takes startingCountryInfo, and duplicates any number of its country labels
- * at the beginning of the array.
- * E.g., to have "Germany" and "Italy" at the top of the list, use:
- *     dupeCommonCountries(['de', 'it')
- * @param {array} startingCountryInfo array of country objects
- *     like [{value: 'ca', label: 'Canada'}, ...]
- * @param {array} commonCountryCodes array of country codes we should duplicate
- * @returns {array} revised array of country objects, with duplicates inserted at beginning
- */
-const dupeCommonCountries = module.exports.dupeCommonCountries = (startingCountryInfo, commonCountryCodes) => {
-    const newCountryInfo = startingCountryInfo.map(item => ({...item}));
-    commonCountryCodes.reverse().forEach(commonCountryCode => {
-        const existing = newCountryInfo
-            .find(country => country.code === commonCountryCode.toLowerCase());
-        if (existing) newCountryInfo.unshift(existing);
-    });
-    return newCountryInfo;
-};
-
-/*
- * registrationCountryOptions is the result of taking the standard countryInfo,
- * and duplicating 'United States of America' and 'United Kingdom' at the top of the list.
- * The result is an array like:
- * [
- *    {code: 'us', name: 'United States', display: 'United States of America'},
- *    {code: 'gb', name: 'United Kingdom'},
- *    {code: 'af', name: 'Afghanistan'},
- *    ...
- *    {code: 'ae', name: 'United Arab Emirates'},
- *    {code: 'us', name: 'United States', display: 'United States of America'},
- *    {code: 'gb', name: 'United Kingdom'},
- *    {code: 'uz', name: 'Uzbekistan'},
- *    ...
- *    {code: 'zm', name: 'Zimbabwe'}
- * ]
- */
-module.exports.registrationCountryOptions =
-    countryOptions(dupeCommonCountries(countryInfo, ['us', 'gb']), 'code');
diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
index cc8bda902..a1d2eae3a 100644
--- a/src/views/teacherregistration/teacherregistration.jsx
+++ b/src/views/teacherregistration/teacherregistration.jsx
@@ -115,9 +115,7 @@ class TeacherRegistration extends React.Component {
                             onNextStep={this.handleAdvanceStep}
                         />
                         <Steps.PhoneNumberStep
-                            defaultCountry={
-                                this.state.formData.user && this.state.formData.user.country
-                            }
+                            defaultCountry={this.state.formData.countryCode}
                             waiting={this.state.waiting}
                             onNextStep={this.handleAdvanceStep}
                         />
@@ -126,9 +124,7 @@ class TeacherRegistration extends React.Component {
                             onNextStep={this.handleAdvanceStep}
                         />
                         <Steps.AddressStep
-                            defaultCountry={
-                                this.state.formData.user && this.state.formData.user.country
-                            }
+                            defaultCountry={this.state.formData.countryCode}
                             waiting={this.state.waiting}
                             onNextStep={this.handleAdvanceStep}
                         />
diff --git a/test/unit/lib/country-data.test.js b/test/unit/lib/country-data.test.js
index 395ce4fb0..5c8122604 100644
--- a/test/unit/lib/country-data.test.js
+++ b/test/unit/lib/country-data.test.js
@@ -1,28 +1,99 @@
 const {
+    countryInfo,
     countryOptions,
+    lookupCountryInfo,
+    dupeCommonCountries,
+    registrationCountryOptions,
     subdivisionOptions
 } = require('../../../src/lib/country-data');
 
 describe('unit test lib/country-data.js', () => {
 
-    test('countryOptions has the ballpark number of countries we expect', () => {
-        expect(typeof countryOptions).toBe('object');
-        expect(countryOptions.length > 200).toEqual(true);
-        expect(countryOptions.length < 300).toEqual(true);
+    test('countryInfo has the ballpark number of countries we expect', () => {
+        expect(typeof countryInfo).toBe('object');
+        expect(countryInfo.length > 200).toEqual(true);
+        expect(countryInfo.length < 300).toEqual(true);
     });
 
-    test('countryOptions is in alphabetical order', () => {
-        // test whether countryOptions is already sorted, by:
-        // 1) creating a sorted version of countryOptions
-        const sortedCountryOptions = countryOptions.sort((a, b) => {
-            if (a.label < b.label) {
-                return -1;
-            }
-            return 1;
-        });
-        // 2) comparing sorted version of countryOptions to original
-        expect(countryOptions.map(option => option.label))
-            .toEqual(sortedCountryOptions.map(option => option.label));
+    test('countryOptions() maintains number of items', () => {
+        expect(typeof countryOptions).toBe('function');
+        const myCountryOptions = countryOptions(countryInfo, 'name');
+        const numCountries = countryInfo.length;
+        expect(myCountryOptions.length).toEqual(numCountries);
+    });
+
+    test('countryOptions() called with value=name will use correct display strings and country name', () => {
+        expect(typeof countryOptions).toBe('function');
+        const myCountryOptions = countryOptions(countryInfo, 'name');
+
+        const eswatiniInfo = myCountryOptions.find(country => country.value === 'Swaziland');
+        expect(eswatiniInfo).toBeTruthy();
+        expect(eswatiniInfo.label).toEqual('Eswatini');
+
+        const swedenInfo = myCountryOptions.find(country => country.value === 'Sweden');
+        expect(swedenInfo).toBeTruthy();
+        expect(swedenInfo.label).toEqual('Sweden');
+    });
+
+    test('countryOptions() called with value==code will use correct display strings and country code', () => {
+        expect(typeof countryOptions).toBe('function');
+        const myCountryOptions = countryOptions(countryInfo, 'code');
+        const szInfo = myCountryOptions
+            .find(country => country.value === 'sz');
+        expect(szInfo).toBeTruthy();
+        expect(szInfo.label).toEqual('Eswatini');
+    });
+
+    test('lookupCountryInfo() will find country info', () => {
+        expect(typeof lookupCountryInfo).toBe('function');
+        const eswatiniInfo = lookupCountryInfo('sz');
+        expect(eswatiniInfo.name).toEqual('Swaziland');
+        expect(eswatiniInfo.display).toEqual('Eswatini');
+        expect(eswatiniInfo.code).toEqual('sz');
+    });
+
+    test('calling dupeCommonCountries() will duplicate the requested country info at start of array', () => {
+        expect(typeof dupeCommonCountries).toBe('function');
+        const countryInfoWithCommon = dupeCommonCountries(countryInfo, ['ca', 'gb']);
+
+        // test that the two entries have been added to the start of the array
+        const numCountries = countryInfo.length;
+        expect(countryInfoWithCommon.length).toEqual(numCountries + 2);
+        expect(countryInfoWithCommon[0]).toEqual({code: 'ca', name: 'Canada'});
+        expect(countryInfoWithCommon[1]).toEqual({code: 'gb', name: 'United Kingdom'});
+
+        // test that there are now two entries for Canada
+        const canadaItems = countryInfoWithCommon.reduce((acc, thisCountry) => (
+            thisCountry.code === 'ca' ? [...acc, thisCountry] : acc
+        ), []);
+        expect(canadaItems.length).toEqual(2);
+        // test that there are now two entries for UK
+        const ukItems = countryInfoWithCommon.reduce((acc, thisCountry) => (
+            thisCountry.code === 'gb' ? [...acc, thisCountry] : acc
+        ), []);
+        expect(ukItems.length).toEqual(2);
+    });
+
+    test('registrationCountryOptions object places USA and UK at start, with display name versions', () => {
+        expect(typeof registrationCountryOptions).toBe('object');
+        const numCountries = countryInfo.length;
+
+        // test that the two entries have been added to the start of the array, and that
+        // the name of the USA includes "America"
+        expect(registrationCountryOptions.length).toEqual(numCountries + 2);
+        expect(registrationCountryOptions[0]).toEqual({value: 'us', label: 'United States of America'});
+        expect(registrationCountryOptions[1]).toEqual({value: 'gb', label: 'United Kingdom'});
+
+        // test that there are now two entries for USA
+        const usaOptions = registrationCountryOptions.reduce((acc, thisCountry) => (
+            thisCountry.value === 'us' ? [...acc, thisCountry] : acc
+        ), []);
+        expect(usaOptions.length).toEqual(2);
+        // test that there are now two entries for UK
+        const ukOptions = registrationCountryOptions.reduce((acc, thisCountry) => (
+            thisCountry.value === 'gb' ? [...acc, thisCountry] : acc
+        ), []);
+        expect(ukOptions.length).toEqual(2);
     });
 
     test('subdivisionOptions object should include correct info for sample country', () => {
diff --git a/test/unit/lib/country-list.test.js b/test/unit/lib/country-list.test.js
deleted file mode 100644
index 2e270e238..000000000
--- a/test/unit/lib/country-list.test.js
+++ /dev/null
@@ -1,88 +0,0 @@
-const {
-    countryInfo,
-    countryOptions,
-    dupeCommonCountries,
-    registrationCountryOptions
-} = require('../../../src/lib/country-list');
-
-describe('unit test lib/country-list.js', () => {
-
-    test('countryInfo has the ballpark number of countries we expect', () => {
-        expect(typeof countryInfo).toBe('object');
-        expect(countryInfo.length > 200).toEqual(true);
-        expect(countryInfo.length < 300).toEqual(true);
-    });
-
-    test('countryOptions() maintains number of items', () => {
-        expect(typeof countryOptions).toBe('function');
-        const myCountryOptions = countryOptions(countryInfo, 'name');
-        const numCountries = countryInfo.length;
-        expect(myCountryOptions.length).toEqual(numCountries);
-    });
-
-    test('countryOptions() called with value=name will use correct display strings and country name', () => {
-        expect(typeof countryOptions).toBe('function');
-        const myCountryOptions = countryOptions(countryInfo, 'name');
-
-        const eswatiniInfo = myCountryOptions.find(country => country.value === 'Swaziland');
-        expect(eswatiniInfo).toBeTruthy();
-        expect(eswatiniInfo.label).toEqual('Eswatini');
-
-        const swedenInfo = myCountryOptions.find(country => country.value === 'Sweden');
-        expect(swedenInfo).toBeTruthy();
-        expect(swedenInfo.label).toEqual('Sweden');
-    });
-
-    test('countryOptions() called with value==code will use correct display strings and country code', () => {
-        expect(typeof countryOptions).toBe('function');
-        const myCountryOptions = countryOptions(countryInfo, 'code');
-        const szInfo = myCountryOptions
-            .find(country => country.value === 'sz');
-        expect(szInfo).toBeTruthy();
-        expect(szInfo.label).toEqual('Eswatini');
-    });
-
-    test('calling dupeCommonCountries() will duplicate the requested country info at start of array', () => {
-        expect(typeof dupeCommonCountries).toBe('function');
-        const countryInfoWithCommon = dupeCommonCountries(countryInfo, ['ca', 'gb']);
-
-        // test that the two entries have been added to the start of the array
-        const numCountries = countryInfo.length;
-        expect(countryInfoWithCommon.length).toEqual(numCountries + 2);
-        expect(countryInfoWithCommon[0]).toEqual({code: 'ca', name: 'Canada'});
-        expect(countryInfoWithCommon[1]).toEqual({code: 'gb', name: 'United Kingdom'});
-
-        // test that there are now two entries for Canada
-        const canadaItems = countryInfoWithCommon.reduce((acc, thisCountry) => (
-            thisCountry.code === 'ca' ? [...acc, thisCountry] : acc
-        ), []);
-        expect(canadaItems.length).toEqual(2);
-        // test that there are now two entries for UK
-        const ukItems = countryInfoWithCommon.reduce((acc, thisCountry) => (
-            thisCountry.code === 'gb' ? [...acc, thisCountry] : acc
-        ), []);
-        expect(ukItems.length).toEqual(2);
-    });
-
-    test('registrationCountryOptions object places USA and UK at start, with display name versions', () => {
-        expect(typeof registrationCountryOptions).toBe('object');
-        const numCountries = countryInfo.length;
-
-        // test that the two entries have been added to the start of the array, and that
-        // the name of the USA includes "America"
-        expect(registrationCountryOptions.length).toEqual(numCountries + 2);
-        expect(registrationCountryOptions[0]).toEqual({value: 'us', label: 'United States of America'});
-        expect(registrationCountryOptions[1]).toEqual({value: 'gb', label: 'United Kingdom'});
-
-        // test that there are now two entries for USA
-        const usaOptions = registrationCountryOptions.reduce((acc, thisCountry) => (
-            thisCountry.value === 'us' ? [...acc, thisCountry] : acc
-        ), []);
-        expect(usaOptions.length).toEqual(2);
-        // test that there are now two entries for UK
-        const ukOptions = registrationCountryOptions.reduce((acc, thisCountry) => (
-            thisCountry.value === 'gb' ? [...acc, thisCountry] : acc
-        ), []);
-        expect(ukOptions.length).toEqual(2);
-    });
-});