diff --git a/base_location/company_view.xml b/base_location/company_view.xml
index d697158e3..9aa24e358 100644
--- a/base_location/company_view.xml
+++ b/base_location/company_view.xml
@@ -9,6 +9,7 @@
       <field name="arch" type="xml">
         <field name="street2" position="after">
           <field name="better_zip_id"
+                 options="{'create_name_field': 'city'}"
                  colspan="4"
                  on_change="on_change_city(better_zip_id)"
                  placeholder="City completion" />
diff --git a/base_location/partner_view.xml b/base_location/partner_view.xml
index 5a11016b0..1329b1e02 100644
--- a/base_location/partner_view.xml
+++ b/base_location/partner_view.xml
@@ -8,11 +8,20 @@
       <field name="arch" type="xml">
         <field name="street2" position="after">
           <field name="zip_id"
+                 options="{'create_name_field': 'city'}"
                  on_change="onchange_zip_id(zip_id)"
                  placeholder="City completion"
-			     attrs="{'invisible': [('use_parent_address','=',True)]}"
-			     />
+                 attrs="{'invisible': [('use_parent_address','=',True)]}"
+                 />
         </field>
+        <xpath expr="//field[@name='child_ids']/form//field[@name='street2']" position="after">
+          <field name="zip_id"
+                 options="{'create_name_field': 'city'}"
+                 on_change="onchange_zip_id(zip_id)"
+                 placeholder="City completion"
+                 attrs="{'invisible': [('use_parent_address','=',True)]}"
+                 />
+        </xpath>
       </field>
     </record>
   </data>