diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bfd8768aacd..50b986774b9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -553,11 +553,6 @@ class Form
                     $socid = $obj->rowid?$obj->rowid:'';
                 }
 
-                // We call a page after a small delay when a new input has been selected
-                //$javaScript = "window.location=\'...\'";
-                //$htmloption = 'onChange="ac_delay(\''.$javaScript.'\',\'500\')"';
-                $htmloption='';
-
                 print "\n".'<!-- Input text for third party with Ajax.Autocompleter (select_societes) -->'."\n";
                 print '<table class="nobordernopadding"><tr class="nocellnopadd">';
                 print '<td class="nobordernopadding">';
@@ -565,12 +560,11 @@ class Form
                 print '<div class="ui-widget">';
                 if ($socid == 0)
                 {
-                    //$langs->load("companies");
-                    print '<input type="text" size="30" id="'.$htmlname.'" name="'.$htmlname.'" value="" '.$htmloption.' />';
+                    print '<input type="text" size="30" id="'.$htmlname.'" name="'.$htmlname.'" value="" />';
                 }
                 else
                 {
-                    print '<input type="text" size="30" id="'.$htmlname.'" name="'.$htmlname.'" value="'.$obj->nom.'" '.$htmloption.' />';
+                    print '<input type="text" size="30" id="'.$htmlname.'" name="'.$htmlname.'" value="'.$obj->nom.'" />';
                 }
                 print '</div>';
                 //print ajax_autocompleter(($socid?$socid:-1),$htmlname,'socid',DOL_URL_ROOT.'/societe/ajaxcompanies.php?filter='.urlencode($filter), '');
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php
index 4911b142a85..cd600f992be 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -91,11 +91,27 @@ function ajax_autocompleter($selected='',$htmlname,$value,$url,$indicator='worki
 	$script.= '<script type="text/javascript">';
 	$script.= 'jQuery(document).ready(function() {
     				jQuery("#'.$htmlname.'").autocomplete({
-    					source: "'.$url.'",
+    					source: function( request, response ) {
+    						jQuery.ajax({
+    							url: "'.$url.'",
+    							dataType: "jsonp",
+    							data: {
+    								socid: request.term
+								},
+								success: function( data ) {
+									response( $.map( data.result, function( item ) {
+										return {
+											label: item.socname,
+											value: item.socid
+										}
+									}));
+								}
+							});
+						},		
     					minLength: 2,
     					select: function( event, ui ) {
-    						jQuery("#'.$htmlname.'").val(ui.item.socname);
-    						jQuery("#'.$value.'").val(ui.item.socid);
+    						jQuery("#'.$htmlname.'").val(ui.item.label);
+    						jQuery("#'.$value.'").val(ui.item.value);
     					}
 					});
   				});';
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index 14c03d1fc51..d333131bcda 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -55,13 +55,13 @@ dol_syslog(join(',',$_GET));
 
 
 // Generation liste des societes
-if (! empty($_POST['newcompany']) || ! empty($_GET['term']) || ! empty($_POST['id_fourn']))
+if (! empty($_POST['newcompany']) || ! empty($_GET['socid']) || ! empty($_POST['id_fourn']))
 {
 	$return_arr = array();
 	
 	// Define filter on text typed
 	$socid = $_POST['newcompany']?$_POST['newcompany']:'';
-	if (! $socid) $socid = $_GET['term']?$_GET['term']:'';
+	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
 	if (! $socid) $socid = $_POST['id_fourn']?$_POST['id_fourn']:'';
 
 	$sql = "SELECT rowid, nom";
@@ -100,8 +100,8 @@ if (! empty($_POST['newcompany']) || ! empty($_GET['term']) || ! empty($_POST['i
 		}
 		print '</ul>';
 		*/
-	    
-	    echo json_encode($return_arr);
+	    $result = array('result' => $return_arr);
+	    echo json_encode($result);
 	}
 }
 else