diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index 699a37287..eb17888ce 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -303,7 +303,9 @@ class AddressControllerCore extends FrontController
 			$selected_country = (int)$this->_address->id_country;
 		else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 		{
-			$array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			// get all countries as language (xy) or language-country (wz-XY)
+			$array = array();
+			preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array);
 			if (!Validate::isLanguageIsoCode($array[0]) || !($selected_country = Country::getByIso($array[0])))
 				$selected_country = (int)Configuration::get('PS_COUNTRY_DEFAULT');
 		}
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 717937594..1129f2f8e 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -103,7 +103,9 @@ class AuthControllerCore extends FrontController
 			
 			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 			{
-				$array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+				// get all countries as language (xy) or language-country (wz-XY)
+				$array = array();
+				preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array);
 				if (!Validate::isLanguageIsoCode($array[0]) || !($sl_country = Country::getByIso($array[0])))
 					$sl_country = (int)Configuration::get('PS_COUNTRY_DEFAULT');
 			}