diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bfdec57b0d1..bae25444ed8 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -613,7 +613,7 @@ class FormCompany
 	function select_zipcode($selected='',$field1='zipcode',$field2='town',$field3='fk_pays')
 	{
 		print ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n";
-		print '<input id="search_'.$field1.'" type="text" name="search_'.$field1.'" size="6"  value="'.$selected.'">'."\n";
+		print '<input id="'.$field1.'" type="text" name="'.$field1.'" size="6"  value="'.$selected.'">'."\n";
 	}
 	
 	/**
@@ -622,7 +622,7 @@ class FormCompany
 	function select_town($selected='',$field1='town',$field2='zipcode',$field3='fk_pays')
 	{
 		print ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n";
-		print '<input id="search_'.$field1.'" type="text" name="search_'.$field1.'" value="'.$selected.'">'."\n";
+		print '<input id="'.$field1.'" type="text" name="'.$field1.'" value="'.$selected.'">'."\n";
 	}
 
 }
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php
index 1dfac97e4a2..e6ed21d8391 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -138,26 +138,26 @@ function ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,$url,$o
 {
 	$script='';
 	
-	$script.= '<input type="hidden" name="'.$field1.'" id="'.$field1.'" value="'.$selected.'" />';
+	//$script.= '<input type="hidden" name="'.$field1.'" id="'.$field1.'" value="'.$selected.'" />';
 
 	$script.= '<script type="text/javascript">';
 	$script.= 'jQuery(document).ready(function() {
-					jQuery("input#search_'.$field1.'").blur(function() {
+					//jQuery("input#'.$field1.'").blur(function() {
     					//console.log(this.value.length);
-					    if (this.value.length == 0)
-					    {
-                            jQuery("#'.$field1.'").val("");
-                            jQuery("#'.$field2.'").val("");
-					    }
-                    });
-    				jQuery("input#search_'.$field1.'").autocomplete({
+					    //if (this.value.length == 0)
+					    //{
+                        //    jQuery("#'.$field1.'").val("");
+                        //    jQuery("#'.$field2.'").val("");
+					    //}
+                    //});
+    				jQuery("input#'.$field1.'").autocomplete({
     					source: function( request, response ) {
     						jQuery.get("'.$url.($option?'?'.$option:'').'", { '.$field1.': request.term }, function(data){
 								response( jQuery.map( data, function( item ) {
 									if (data.length == 1) {
-										jQuery("#'.$field1.'").val(item.value);
-										jQuery("#'.$field2.'").val(item.field2);
-										jQuery("#search_'.$field2.'").val(item.field2);
+										jQuery("input#'.$field1.'").val(item.value);
+										jQuery("input#'.$field2.'").val(item.field2);
+										//jQuery("#search_'.$field2.'").val(item.field2);
 										if (item.field3 > 0) {
 											jQuery("#'.$field3.'").val(item.field3);
 										}
@@ -174,11 +174,13 @@ function ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,$url,$o
 						dataType: "json",
     					minLength: 2,
     					select: function( event, ui ) {
-    						jQuery("#'.$field2.'").val(ui.item.field2);
-    						jQuery("#search_'.$field2.'").val(ui.item.field2);
+    						jQuery("input#'.$field1.'").val(ui.item.value);
+    						jQuery("input#'.$field2.'").val(ui.item.field2);
+    						//jQuery("#search_'.$field2.'").val(ui.item.field2);
     						if (ui.item.field3 > 0) {
     							jQuery("#'.$field3.'").val(ui.item.field3);
     						}
+    						//alert(ui.item.field2);
     					}
 					});
   				});';