diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 52eeafb4c8a..c92eae3f6b2 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -116,8 +116,10 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 				$row_array['value'] = $row['town'];
 				$row_array['zipcode'] = $row['zip'];
 			}
-			$row_array['selectpays_id'] = $row['fk_country'];
-			$row_array['departement_id'] = $row['fk_county'];
+			$row_array['selectpays_id'] = $row['fk_country'];    // TODO deprecated
+			$row_array['departement_id'] = $row['fk_county'];    // TODO deprecated
+			$row_array['selectcountry_id'] = $row['fk_country'];
+			$row_array['state_id'] = $row['fk_county'];
 
 			$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 6549eb9dbbc..b411d2fffae 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -83,6 +83,7 @@ function ajax_autocompleter($selected='',$htmlname,$url,$option='',$minLength=2,
 
 /**
  *	Get value of field, do Ajax process and return result
+ *
  *	@param	    htmlname            nom et id du champ
  *	@param		fields				other fields to autocomplete
  *	@param	    url                 chemin du fichier de reponse : /chemin/fichier.php
@@ -128,7 +129,7 @@ function ajax_multiautocompleter($htmlname,$fields,$url,$option='',$minLength=2,
 
     						for (i=0;i<length;i++) {
     							//alert(fields[i] + " = " + ui.item[fields[i]]);
-								if (fields[i]=="selectpays_id")
+								if (fields[i]=="selectcountry_id" || fields[i]=="selectpays_id")
 								{
 								    if (ui.item[fields[i]] > 0)     // Do not erase country if unknown
 								    {
@@ -139,7 +140,7 @@ function ajax_multiautocompleter($htmlname,$fields,$url,$option='',$minLength=2,
                                         }
 								    }
 								}
-                                else if (fields[i]=="departement_id")
+                                else if (fields[i]=="state_id" || fields[i]=="departement_id")
                                 {
                                     if (ui.item[fields[i]] > 0)     // Do not erase state if unknown
                                     {
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 4b67646c901..94d04daaa0b 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -776,7 +776,7 @@ else
 
         // Country
         print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
-        $form->select_pays($object->country_id,'country_id');
+        print $form->select_country($object->country_id,'country_id');
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
         print '</td></tr>';
 
@@ -1028,7 +1028,7 @@ else
                 $object->address				= $_POST["adresse"];
                 $object->zip					= $_POST["zipcode"];
                 $object->town					= $_POST["town"];
-                $object->country_id				= $_POST["country_id"]?$_POST["country_id"]:$mysoc->pays_id;
+                $object->country_id				= $_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
                 $object->state_id				= $_POST["departement_id"];
                 $object->tel					= $_POST["tel"];
                 $object->fax					= $_POST["fax"];
@@ -1221,7 +1221,7 @@ else
 
             // Country
             print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-            $form->select_pays($object->country_id,'country_id');
+            print $form->select_country($object->country_id,'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
             print '</td></tr>';
 
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 2f4b74ba291..37a7898527e 100644
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -187,13 +187,18 @@ if ($result >= 0)
 			$member->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
 
 			//$member->societe;
-			$member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
 			$member->adresse=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS]; // TODO obsolete
-			$member->cp=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
-			$member->ville=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
-			$member->pays=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];	// Pays en libelle
-			$member->pays_id=$countries[$hashlib2rowid[strtolower($member->pays)]]['rowid'];
-			$member->pays_code=$countries[$hashlib2rowid[strtolower($member->pays)]]['code'];
+			$member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
+			$member->cp=$ldapuser[$conf->global->LDAP_FIELD_ZIP];    // TODO obsolete
+			$member->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
+			$member->ville=$ldapuser[$conf->global->LDAP_FIELD_TOWN];    // TODO obsolete
+			$member->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
+			$member->pays=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];	// TODO obsolete
+			$member->country=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];
+			$member->pays_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid'];    // TODO obsolete
+			$member->country_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid'];
+			$member->pays_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code'];    // TODO obsolete
+			$member->country_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code'];
 
 			$member->phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
 			$member->phone_perso=$ldapuser[$conf->global->LDAP_FIELD_PHONE_PERSO];