diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 168ade3ae8b..3826a1b10d0 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -480,7 +480,7 @@ if (GETPOST('action') == 'create')
 	}
 	else
 	{
-		print $html->select_societes('','socid','',1,1);
+		print $html->select_societes('','company','',1,1);
 	}
 	print '</td></tr>';
 
@@ -668,7 +668,7 @@ if ($id)
 		// Company
 		print '<tr><td>'.$langs->trans("Company").'</td>';
 		print '<td>';
-		print $html->select_societes($act->societe->id,'socid','',1,1);
+		print $html->select_societes($act->societe->id,'company','',1,1);
 		print '</td>';
 
 		// Contact
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 78b00be8531..7826d346b15 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -526,7 +526,7 @@ class Form
      * 		\param		showtype		Show third party type in combolist (customer, prospect or supplier)
      * 		\param		forcecombo		Force to use combo box
      */
-    function select_societes($selected='',$htmlname='socid',$filter='',$showempty=0, $showtype=0, $forcecombo=0)
+    function select_societes($selected='',$htmlname='company',$filter='',$showempty=0, $showtype=0, $forcecombo=0)
     {
         global $conf,$user,$langs;
 
@@ -570,7 +570,7 @@ class Form
                 {
                     print '<input type="text" size="30" id="'.$htmlname.'" name="'.$htmlname.'" value="'.$obj->nom.'" '.$htmloption.' />';
                 }
-                print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php?filter='.urlencode($filter), '');
+                print ajax_autocompleter(($socid?$socid:-1),$htmlname,'socid',DOL_URL_ROOT.'/societe/ajaxcompanies.php?filter='.urlencode($filter), '');
                 print '</td>';
                 print '<td class="nobordernopadding" align="left" width="16">';
                 print ajax_indicator($htmlname,'working');  // Indicator is here
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php
index dc43892c603..aab917e96e2 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -81,14 +81,25 @@ function ajax_updater($htmlname,$keysearch,$url,$option='',$indicator='working')
  *	\param     	indicator           nom de l'image gif sans l'extension
  *	\return    	string              script complet
  */
-function ajax_autocompleter($selected='',$htmlname,$url,$indicator='working')
+function ajax_autocompleter($selected='',$htmlname,$value,$url,$indicator='working')
 {
 	$script='';
 
-	$script.= '<input type="hidden" name="'.$htmlname.'_id" id="'.$htmlname.'_id" value="'.$selected.'" />';
+	$script.= '<input type="hidden" name="'.$value.'" id="'.$value.'" value="'.$selected.'" />';
 
 	$script.= '<div id="result'.$htmlname.'" class="autocomplete"></div>';
 	$script.= '<script type="text/javascript">';
+	$script.= 'jQuery(document).ready(function() {
+    				jQuery("input#'.$htmlname.'").autocomplete({
+    					source: "'.$url.'",
+    					minLength: 2,
+    					select: function( event, ui ) {
+    						'.$htmlname.': ui.item.value,
+    						'.$value.': ui.item.id
+    					}
+					});
+  				});';
+	/*
 	$script.= 'new Ajax.Autocompleter(\''.$htmlname.'\',\'result'.$htmlname.'\',\''.$url.'\',{
 	           method: \'post\',
 	           paramName: \'socid\',
@@ -98,7 +109,7 @@ function ajax_autocompleter($selected='',$htmlname,$url,$indicator='working')
 	         });';	// paramName must be 'socid', as it is the name of POST parameter to send value in htmlname field.
 					// and it is name of parameter read by ajaxcompanies.php
 		// Note: The ac_return will fill value inside field htmlname (param of Autocompleter constructor)
-		// and will also fill value inside field htmlname_id (using function ac_return)
+		// and will also fill value inside field htmlname_id (using function ac_return)*/
 	$script.= '</script>';
 
 	return $script;