diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index aebe9a4be9a..297ea6d8297 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -171,14 +171,6 @@ define('FPDF_FONTPATH', FPDF_PATH . 'font/');
 require_once(FPDF_PATH . "fpdf.php");
 
 
-/*
- * Active fonction remplissage ville depuis cp
- */
-if (defined('MAIN_AUTO_FILLTOWNFROMZIP') && MAIN_AUTO_FILLTOWNFROMZIP == 1)
-{
-$conf->filltownfromzip=MAIN_AUTO_FILLTOWNFROMZIP;
-}
-
 /*
  * Autres paramètres globaux de configurations
  */
diff --git a/htdocs/searchpostalcode.php b/htdocs/searchpostalcode.php
index 1f05ca22623..af1f5b266e3 100644
--- a/htdocs/searchpostalcode.php
+++ b/htdocs/searchpostalcode.php
@@ -80,7 +80,7 @@ if ($user->societe_id > 0)
 
 
 
-top_htmlhead($head, $title, $target);
+top_htmlhead("", $langs->trans("SearchTown"), "");
 
 
 print "
diff --git a/htdocs/soc.js.php b/htdocs/soc.js.php
index 719a3d70a68..313bb01167d 100644
--- a/htdocs/soc.js.php
+++ b/htdocs/soc.js.php
@@ -10,4 +10,8 @@ $js_OpenPopupWindow = "function PopupPostalCode(postalcode,objectville)
 }
 ";
 
+print '<script language="javascript">'."\n";
+print $js_OpenPopupWindow;
+print "\n</script>\n";
+
 ?>
diff --git a/htdocs/soc.php b/htdocs/soc.php
index f229e88c2c3..8b44fed1eb3 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -173,10 +173,6 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
     
         include("./soc.js.php");
     
-        print '<script language="javascript">'."\n";
-        print $js_OpenPopupWindow;
-        print "\n</script>\n";
-    
         print '<form action="soc.php" method="post" name="formsoc">';
     
         print '<input type="hidden" name="codeclient_modifiable" value="1">';
@@ -260,9 +256,9 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
             print '</textarea></td></tr>';
     
             print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'"';
-            if ($conf->filltownfromzip) print ' onblur="PopupPostalCode(cp.value,ville)"';
+            if ($conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onblur="PopupPostalCode(cp.value,ville)"';
             print '>';
-            if ($conf->filltownfromzip) print ' <input type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">';
+            if ($conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">';
             print '</td>';
             print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>';