diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e30b0fbd478..e9c2b597398 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -484,6 +484,9 @@ class Conf
 		// By default, we propagate contacts
 		if (! isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN='*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
 		    
+		// By default, we use the zip town autofill
+		if (! isset($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY=1;
+		
 		// Define list of limited modules
 		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,supplier_proposal,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent';	// '' means 'all'. Note that contact is added here as it should be a module later.