diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bae25444ed8..41528814026 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -612,7 +612,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 ajax_autocompleter_ziptown($field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n";
 		print '<input id="'.$field1.'" type="text" name="'.$field1.'" size="6"  value="'.$selected.'">'."\n";
 	}
 	
@@ -621,7 +621,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 ajax_autocompleter_ziptown($field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\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 602844df14c..c5d249a4c2b 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -134,20 +134,12 @@ function ajax_autocompleter($selected='',$htmlname,$url,$option='')
  *	\param	    url                 chemin du fichier de reponse : /chemin/fichier.php
  *	\return    	string              script complet
  */
-function ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,$url,$option='')
+function ajax_autocompleter_ziptown($field1,$field2,$field3,$url,$option='')
 {
 	$script='';
 
 	$script.= '<script type="text/javascript">';
 	$script.= 'jQuery(document).ready(function() {
-					jQuery("input#'.$field1.'").blur(function() {
-    					//console.log(this.value.length);
-					    if (this.value.length == 0)
-					    {
-                            jQuery("input#'.$field1.'").val("");
-                            jQuery("input#'.$field2.'").val("");
-					    }
-                    });
     				jQuery("input#'.$field1.'").autocomplete({
     					source: function( request, response ) {
     						jQuery.get("'.$url.($option?'?'.$option:'').'", { '.$field1.': request.term }, function(data){
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 94af4866f57..4cc24a0bc0d 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1181,12 +1181,16 @@ else
 			print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
 			print $soc->address;
 			print '</textarea></td></tr>';
-
+			
 			// Zip / Town
-			print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">';
-			if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
-			print '</td>';
-			print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';
+			print '<tr><td>'.$langs->trans('Zip').'</td><td>';
+			$formcompany->select_zipcode($soc->cp,'zipcode','town','selectpays_id');
+			//print '<input size="6" type="text" name="cp" value="'.$soc->cp.'">';
+			//if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
+			print '</td><td>'.$langs->trans('Town').'</td><td>';
+			$formcompany->select_zipcode($soc->ville,'town','zipcode','selectpays_id');
+			//print '<input type="text" name="ville" value="'.$soc->ville.'">';
+			print '</td></tr>';
 
 			// Country
 			print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';