diff --git a/app/bundles/CoreBundle/Assets/json/countries.json b/app/bundles/CoreBundle/Assets/json/countries.json
index 7080217eab3..f80a3191c00 100644
--- a/app/bundles/CoreBundle/Assets/json/countries.json
+++ b/app/bundles/CoreBundle/Assets/json/countries.json
@@ -1,246 +1,246 @@
-[
-    "Afghanistan",
-    "Åland Islands",
-    "Albania",
-    "Algeria",
-    "Andorra",
-    "Angola",
-    "Anguilla",
-    "Antarctica",
-    "Antigua and Barbuda",
-    "Argentina",
-    "Armenia",
-    "Aruba",
-    "Australia",
-    "Austria",
-    "Azerbaijan",
-    "Bahamas",
-    "Bahrain",
-    "Bangladesh",
-    "Barbados",
-    "Belarus",
-    "Belgium",
-    "Belize",
-    "Benin",
-    "Bermuda",
-    "Bhutan",
-    "Bolivia",
-    "Bonaire, Saint Eustatius and Saba",
-    "Bosnia and Herzegovina",
-    "Botswana",
-    "Bouvet Island",
-    "Brazil",
-    "Brunei",
-    "Bulgaria",
-    "Burkina Faso",
-    "Burundi",
-    "Cape Verde",
-    "Cambodia",
-    "Cameroon",
-    "Canada",
-    "Cayman Islands",
-    "Central African Republic",
-    "Chad",
-    "Chile",
-    "China",
-    "Colombia",
-    "Comoros",
-    "Cook Islands",
-    "Costa Rica",
-    "Croatia",
-    "Cuba",
-    "Curaçao",
-    "Cyprus",
-    "Czech Republic",
-    "Denmark",
-    "Djibouti",
-    "Dominica",
-    "Dominican Republic",
-    "Democratic Republic of the Congo",
-    "East Timor",
-    "Ecuador",
-    "Egypt",
-    "El Salvador",
-    "Equatorial Guinea",
-    "Eritrea",
-    "Estonia",
-    "Ethiopia",
-    "Falkland Islands",
-    "Fiji",
-    "Finland",
-    "France",
-    "French Guiana",
-    "French Polynesia",
-    "Gabon",
-    "Gambia",
-    "Georgia",
-    "Germany",
-    "Ghana",
-    "Gibraltar",
-    "Greece",
-    "Greenland",
-    "Grenada",
-    "Guadeloupe",
-    "Guam",
-    "Guatemala",
-    "Guernsey",
-    "Guinea",
-    "Guinea Bissau",
-    "Guyana",
-    "Haiti",
-    "Heard Island and McDonald Islands",
-    "Holy See",
-    "Honduras",
-    "Hong Kong",
-    "Hungary",
-    "Iceland",
-    "India",
-    "Indonesia",
-    "Iran",
-    "Iraq",
-    "Ireland",
-    "Israel",
-    "Isle of Man",
-    "Italy",
-    "Ivory Coast",
-    "Jamaica",
-    "Japan",
-    "Jersey",
-    "Jordan",
-    "Kazakhstan",
-    "Kenya",
-    "Kiribati",
-    "Kosovo",
-    "Kuwait",
-    "Kyrgyzstan",
-    "Laos",
-    "Latvia",
-    "Lebanon",
-    "Lesotho",
-    "Liberia",
-    "Libya",
-    "Liechtenstein",
-    "Lithuania",
-    "Luxembourg",
-    "Macao",
-    "Macedonia",
-    "Madagascar",
-    "Malawi",
-    "Malaysia",
-    "Maldives",
-    "Mali",
-    "Malta",
-    "Marshall Islands",
-    "Martinique",
-    "Mauritania",
-    "Mauritius",
-    "Mayotte",
-    "Mexico",
-    "Micronesia",
-    "Moldova",
-    "Monaco",
-    "Mongolia",
-    "Montenegro",
-    "Montserrat",
-    "Morocco",
-    "Mozambique",
-    "Myanmar",
-    "Namibia",
-    "Nauru",
-    "Nepal",
-    "Netherlands",
-    "New Caledonia",
-    "New Zealand",
-    "Nicaragua",
-    "Niger",
-    "Nigeria",
-    "Niue",
-    "North Korea",
-    "Northern Mariana Islands",
-    "Norway",
-    "Oman",
-    "Pakistan",
-    "Palau",
-    "Palestine",
-    "Panama",
-    "Papua New Guinea",
-    "Paraguay",
-    "Peru",
-    "Philippines",
-    "Pitcairn",
-    "Poland",
-    "Portugal",
-    "Puerto Rico",
-    "Qatar",
-    "Republic of the Congo",
-    "Réunion",
-    "Romania",
-    "Russia",
-    "Rwanda",
-    "Saint Barthelemy",
-    "Saint Helena, Ascension and Tristan da Cunha",
-    "Saint Kitts and Nevis",
-    "Saint Lucia",
-    "Saint Martin",
-    "Saint Pierre and Miquelon",
-    "Saint Vincent and the Grenadines",
-    "Samoa",
-    "San Marino",
-    "Sao Tome and Principe",
-    "Saudi Arabia",
-    "Senegal",
-    "Serbia",
-    "Seychelles",
-    "Sierra Leone",
-    "Singapore",
-    "Slovakia",
-    "Slovenia",
-    "Solomon Islands",
-    "Somalia",
-    "South Africa",
-    "South Georgia and the South Sandwich Islands",
-    "South Korea",
-    "South Sudan",
-    "Spain",
-    "Sri Lanka",
-    "Svalbard and Jan Mayen",
-    "Sudan",
-    "Suriname",
-    "Swaziland",
-    "Sweden",
-    "Switzerland",
-    "Syria",
-    "Tahiti",
-    "Taiwan",
-    "Tajikistan",
-    "Tanzania",
-    "Thailand",
-    "Togo",
-    "Tokelau",
-    "Tonga",
-    "Trinidad and Tobago",
-    "Tunisia",
-    "Turkey",
-    "Turkmenistan",
-    "Turks and Caicos Islands",
-    "Tuvalu",
-    "United Kingdom",
-    "United States",
-    "Unknown",
-    "Uganda",
-    "Ukraine",
-    "United Arab Emirates",
-    "Uruguay",
-    "Uzbekistan",
-    "Vanuatu",
-    "Venezuela",
-    "Vietnam",
-    "Virgin Islands (British)",
-    "Virgin Islands (U.S.)",
-    "Wallis and Futuna",
-    "Western Sahara",
-    "Yemen",
-    "Yugoslavia",
-    "Zambia",
-    "Zimbabwe"
-]
+{
+    "Afghanistan" : "Afghanistan",
+    "Åland Islands" : "Inseln Åland",
+    "Albania" : "Albanien",
+    "Algeria" : "Algerien",
+    "Andorra" : "Andorra",
+    "Angola" : "Angola",
+    "Anguilla" : "Anguilla",
+    "Antarctica" : "Antarktis",
+    "Antigua and Barbuda" : "Antigua und Barbuda",
+    "Argentina" : "Argentinien",
+    "Armenia" : "Armenien",
+    "Aruba" : "Aruba",
+    "Australia" : "Australien",
+    "Austria" : "Österreich",
+    "Azerbaijan" : "Aserbaidschan",
+    "Bahamas" : "Bahamas",
+    "Bahrain" : "Bahrain",
+    "Bangladesh" : "Bangladesch",
+    "Barbados" : "Barbados",
+    "Belarus" : "Weißrussland",
+    "Belgium" : "Belgien",
+    "Belize" : "Belize",
+    "Benin" : "Benin",
+    "Bermuda" : "Bermudas",
+    "Bhutan" : "Bhutan",
+    "Bolivia" : "Bolivien",
+    "Bonaire, Saint Eustatius and Saba" : "Bonaire, Sint Eustatius und Saba",
+    "Bosnia and Herzegovina" : "Bosnien und Herzegowina",
+    "Botswana" : "Botswana",
+    "Bouvet Island" : "Bouvetinsel",
+    "Brazil" : "Brasilien",
+    "Brunei" : "Brunei",
+    "Bulgaria" : "Bulgarien",
+    "Burkina Faso" : "Burkina Faso",
+    "Burundi" : "Burundi",
+    "Cape Verde" : "Kapverden",
+    "Cambodia" : "Kambodscha",
+    "Cameroon" : "Kamerun",
+    "Canada" : "Kanada",
+    "Cayman Islands" : "Kaimaninseln",
+    "Central African Republic" : "Zentralafrikanische Republik",
+    "Chad" : "Tschad",
+    "Chile" : "Chile",
+    "China" : "China",
+    "Colombia" : "Kolumbien",
+    "Comoros" : "Komoren",
+    "Cook Islands" : "Cookinseln",
+    "Costa Rica" : "Costa Rica",
+    "Croatia" : "Kroatien",
+    "Cuba" : "Kuba",
+    "Curaçao" : "Curaçao",
+    "Cyprus" : "Zypern",
+    "Czech Republic" : "Tschechische Republik",
+    "Denmark" : "Dänemark",
+    "Djibouti" : "Dschibuti",
+    "Dominica" : "Dominica",
+    "Dominican Republic" : "Dominikanische Republik",
+    "Democratic Republic of the Congo" : "Demokratische Republik Kongo",
+    "East Timor" : "Osttimor",
+    "Ecuador" : "Ekuador",
+    "Egypt" : "Ägypten",
+    "El Salvador" : "El Salvador",
+    "Equatorial Guinea" : "Äquatorialguinea",
+    "Eritrea" : "Eritrea",
+    "Estonia" : "Estland",
+    "Ethiopia" : "Äthiopien",
+    "Falkland Islands" : "Falklandinseln",
+    "Fiji" : "Fidschi",
+    "Finland" : "Finnland",
+    "France" : "Frankreich",
+    "French Guiana" : "Französisch-Guayana",
+    "French Polynesia" : "Französisch-Polynesien",
+    "Gabon" : "Gabun",
+    "Gambia" : "Gambia",
+    "Georgia" : "Georgien",
+    "Germany" : "Deutschland",
+    "Ghana" : "Ghana",
+    "Gibraltar" : "Gibraltar",
+    "Greece" : "Griechenland",
+    "Greenland" : "Grönland",
+    "Grenada" : "Grenada",
+    "Guadeloupe" : "Guadeloupe",
+    "Guam" : "Guam",
+    "Guatemala" : "Guatemala",
+    "Guernsey" : "Guernsey",
+    "Guinea" : "Guinea",
+    "Guinea Bissau" : "Guinea-Bissau",
+    "Guyana" : "Guyana",
+    "Haiti" : "Haiti",
+    "Heard Island and McDonald Islands" : "Heard und McDonaldinseln",
+    "Holy See" : "Heiliger Stuhl",
+    "Honduras" : "Honduras",
+    "Hong Kong" : "Hongkong",
+    "Hungary" : "Ungarn",
+    "Iceland" : "Island",
+    "India" : "Indien",
+    "Indonesia" : "Indonesien",
+    "Iran" : "Iran",
+    "Iraq" : "Irak",
+    "Ireland" : "Irland",
+    "Israel" : "Israel",
+    "Isle of Man" : "Insel Mann",
+    "Italy" : "Italien",
+    "Ivory Coast" : "Elfenbeinküste",
+    "Jamaica" : "Jamaika",
+    "Japan" : "Japan",
+    "Jersey" : "Jersey",
+    "Jordan" : "Jordanien",
+    "Kazakhstan" : "Kasachstan",
+    "Kenya" : "Kenia",
+    "Kiribati" : "Kiribati",
+    "Kosovo" : "Kosovo",
+    "Kuwait" : "Kuwait",
+    "Kyrgyzstan" : "Kirgisistan",
+    "Laos" : "Laos",
+    "Latvia" : "Lettland",
+    "Lebanon" : "Libanon",
+    "Lesotho" : "Lesotho",
+    "Liberia" : "Liberia",
+    "Libya" : "Libyen",
+    "Liechtenstein" : "Liechtenstein",
+    "Lithuania" : "Litauen",
+    "Luxembourg" : "Luxemburg",
+    "Macao" : "Macao",
+    "Macedonia" : "Nordmazedonien",
+    "Madagascar" : "Madagaskar",
+    "Malawi" : "Malawi",
+    "Malaysia" : "Malaysia",
+    "Maldives" : "Malediven",
+    "Mali" : "Mali",
+    "Malta" : "Malta",
+    "Marshall Islands" : "Marshallinseln",
+    "Martinique" : "Martinique",
+    "Mauritania" : "Mauretanien",
+    "Mauritius" : "Mauritius",
+    "Mayotte" : "Mayotte",
+    "Mexico" : "Mexiko",
+    "Micronesia" : "Föderierte Staaten von Mikronesien",
+    "Moldova" : "Moldawien",
+    "Monaco" : "Monaco",
+    "Mongolia" : "Mongolei",
+    "Montenegro" : "Montenegro",
+    "Montserrat" : "Montserrat",
+    "Morocco" : "Marokko",
+    "Mozambique" : "Mosambik",
+    "Myanmar" : "Myanmar",
+    "Namibia" : "Namibia",
+    "Nauru" : "Nauru",
+    "Nepal" : "Nepal",
+    "Netherlands" : "Niederlande",
+    "New Caledonia" : "Neukaledonien",
+    "New Zealand" : "Neuseeland",
+    "Nicaragua" : "Nicaragua",
+    "Niger" : "Niger",
+    "Nigeria" : "Nigeria",
+    "Niue" : "Niue",
+    "North Korea" : "Nordkorea",
+    "Northern Mariana Islands" : "Nördliche Marianen",
+    "Norway" : "Norwegen",
+    "Oman" : "Oman",
+    "Pakistan" : "Pakistan",
+    "Palau" : "Palau",
+    "Palestine" : "Palästina",
+    "Panama" : "Panama",
+    "Papua New Guinea" : "Papua-Neuguinea",
+    "Paraguay" : "Paraguay",
+    "Peru" : "Peru",
+    "Philippines" : "Philippinen",
+    "Pitcairn" : "Pitcairninseln",
+    "Poland" : "Polen",
+    "Portugal" : "Portugal",
+    "Puerto Rico" : "Puerto Rico",
+    "Qatar" : "Katar",
+    "Republic of the Congo" : "Republik Kongo",
+    "Réunion" : "Réunion",
+    "Romania" : "Rumänien",
+    "Russia" : "Russland",
+    "Rwanda" : "Ruanda",
+    "Saint Barthelemy" : "Saint-Barthélemy",
+    "Saint Helena, Ascension and Tristan da Cunha" : "Heiligen Helena, Ascension und Tristan da Cunha",
+    "Saint Kitts and Nevis" : "St. Kitts und Nevis",
+    "Saint Lucia" : "St. Lucia",
+    "Saint Martin" : "St. Martin",
+    "Saint Pierre and Miquelon" : "St. Pierre und Miquelon",
+    "Saint Vincent and the Grenadines" : "St. Vincent und die Grenadinen",
+    "Samoa" : "Samoa",
+    "San Marino" : "San Marino",
+    "Sao Tome and Principe" : "São Tomé und Príncipe",
+    "Saudi Arabia" : "Saudi-Arabien",
+    "Senegal" : "Senegal",
+    "Serbia" : "Serbien",
+    "Seychelles" : "Seychellen",
+    "Sierra Leone" : "Sierra Leone",
+    "Singapore" : "Singapur",
+    "Slovakia" : "Slowakei",
+    "Slovenia" : "Slowenien",
+    "Solomon Islands" : "Salomonen",
+    "Somalia" : "Somalia",
+    "South Africa" : "Südafrika",
+    "South Georgia and the South Sandwich Islands" : "Südgeorgien und die Südlichen Sandwichinseln",
+    "South Korea" : "Südkorea",
+    "South Sudan" : "Südsudan",
+    "Spain" : "Spanien",
+    "Sri Lanka" : "Sri Lanka",
+    "Svalbard and Jan Mayen" : "Spitzbergen und Jan Mayen",
+    "Sudan" : "Sudan",
+    "Suriname" : "Surinam",
+    "Swaziland" : "Swasiland",
+    "Sweden" : "Schweden",
+    "Switzerland" : "Schweiz",
+    "Syria" : "Syrien",
+    "Tahiti" : "Tahiti",
+    "Taiwan" : "Taiwan",
+    "Tajikistan" : "Tadschikistan",
+    "Tanzania" : "Tansania",
+    "Thailand" : "Thailand",
+    "Togo" : "Togo",
+    "Tokelau" : "Tokelau",
+    "Tonga" : "Tonga",
+    "Trinidad and Tobago" : "Trinidad und Tobago",
+    "Tunisia" : "Tunesien",
+    "Turkey" : "Türkei",
+    "Turkmenistan" : "Turkmenistan",
+    "Turks and Caicos Islands" : "Turks- und Caicosinseln",
+    "Tuvalu" : "Tuvalu",
+    "United Kingdom" : "Vereinigtes Königreich",
+    "United States" : "Vereinigte Staaten",
+    "Unknown" : "Unbekannt",
+    "Uganda" : "Uganda",
+    "Ukraine" : "Ukraine",
+    "United Arab Emirates" : "Vereinigte Arabische Emirate",
+    "Uruguay" : "Uruguay",
+    "Uzbekistan" : "Usbekistan",
+    "Vanuatu" : "Vanuatu",
+    "Venezuela" : "Venezuela",
+    "Vietnam" : "Vietnam",
+    "Virgin Islands (British)" : "Jungferninseln (britisch)",
+    "Virgin Islands (U.S.)" : "Jungferninseln (US-amerikanisch)",
+    "Wallis and Futuna" : "Wallis und Futuna",
+    "Western Sahara" : "Westsahara",
+    "Yemen" : "Jemen",
+    "Yugoslavia" : "Jugoslawien",
+    "Zambia" : "Sambia",
+    "Zimbabwe" : "Simbabwe"
+}
diff --git a/app/bundles/LeadBundle/Helper/FormFieldHelper.php b/app/bundles/LeadBundle/Helper/FormFieldHelper.php
index 78454d2113d..1492697db80 100644
--- a/app/bundles/LeadBundle/Helper/FormFieldHelper.php
+++ b/app/bundles/LeadBundle/Helper/FormFieldHelper.php
@@ -152,9 +152,9 @@ public static function validateProperties($type, &$properties)
     public static function getCountryChoices()
     {
         $countryJson = file_get_contents(__DIR__.'/../../CoreBundle/Assets/json/countries.json');
-        $countries   = json_decode($countryJson);
+        $countries   = json_decode($countryJson, true);
 
-        return array_combine($countries, $countries);
+        return $countries;
     }
 
     /**