diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index a24320f6374..71cfba5f74f 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -315,6 +315,7 @@ class Form
 		$sql = "SELECT rowid, code, libelle, active";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
 		$sql.= " WHERE active = 1";
+		if ($conf->use_ajax && $selected!='' && $conf->global->CODE_DE_TEST == 1) $sql.= " AND rowid = ".$selected;
 		$sql.= " ORDER BY code ASC;";
 	
 		$resql=$this->db->query($sql);
@@ -322,9 +323,11 @@ class Form
 		{
 			if ($conf->use_ajax && $conf->global->CODE_DE_TEST == 1)
 			{
+				$obj = $this->db->fetch_object($resql);
+				$pays_id = $obj->rowid?$obj->rowid:'';
 				print '<div>';
-				print '<input type="text" size="45" id="pays" name="pays" />';
-				print '<input type="hidden" name="pays_id" id="pays_id" value="" '.$htmloption.' />';
+				print '<input type="text" size="45" id="pays" name="pays" value="'.$obj->libelle.'" />';
+				print '<input type="hidden" name="pays_id" id="pays_id" value="'.$pays_id.'" '.$htmloption.' />';
 				print '</div>';
 				print '<div id="hint" class="autocomplete"></div>';
 				print '<script type="text/javascript">';
diff --git a/htdocs/soc.php b/htdocs/soc.php
index b7632e78aef..1c6c6f61aae 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -380,7 +380,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 
         print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
         $form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="autofilltownfromzip_save_refresh_create()"':'');
-        if ($conf->use_javascript && $conf->use_javascript) print '<div id="hint"></div>';//utile pour afficher la recherche des pays avec ajax
+        if ($conf->use_javascript && $conf->use_ajax) print '<div id="hint"></div>';//utile pour afficher la recherche des pays avec ajax
         print '</td></tr>';
 
         print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';