diff --git a/partner_label/reports/res_partner.xml b/partner_label/reports/res_partner.xml
index f1fee27f2..6692ed41f 100644
--- a/partner_label/reports/res_partner.xml
+++ b/partner_label/reports/res_partner.xml
@@ -11,7 +11,7 @@
                 <div class="page">
                     <t t-foreach="docs.with_context(show_address=True)" t-as="this">
                         <div t-attf-style="height: {{this.company_id.partner_labels_height}}mm; width: {{this.company_id.partner_labels_width}}mm; padding: {{this.company_id.partner_labels_padding}}mm; margin: {{this.company_id.partner_labels_margin}}mm; display: inline-block; overflow: hidden;">
-                            <div t-esc="this.name_get()[0][1]" style="white-space: pre-line;" />
+                            <address t-field="this.self" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                         </div>
                     </t>
                 </div>
diff --git a/partner_label/views/base_config_settings.xml b/partner_label/views/base_config_settings.xml
index 806815a5c..ac9343ba2 100644
--- a/partner_label/views/base_config_settings.xml
+++ b/partner_label/views/base_config_settings.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="view_general_configuration" model="ir.ui.view">
-            <field name="model">base.config.settings</field>
-            <field name="inherit_id" ref="base_setup.view_general_configuration" />
-            <field name="arch" type="xml">
-                <group name="report" position="after">
-                    <group name="partner_labels" string="Labels configuration">
-                        <label for="partner_labels_width" />
-                        <div><field name="partner_labels_width" class="oe_inline" /> mm</div>
-                        <label for="partner_labels_height" />
-                        <div><field name="partner_labels_height" class="oe_inline" /> mm</div>
-                        <label for="partner_labels_margin" />
-                        <div><field name="partner_labels_margin" class="oe_inline" /> mm</div>
-                        <label for="partner_labels_padding" />
-                        <div><field name="partner_labels_padding" class="oe_inline" /> mm</div>
-                        <label for="partner_labels_paperformat_id" />
-                        <div>
-                            <field name="partner_labels_paperformat_id" class="oe_inline" />
-                            <button type="object" name="action_partner_labels_preview" string="Preview" />
-                        </div>
-                    </group>
+<odoo>
+    <record id="view_general_configuration" model="ir.ui.view">
+        <field name="model">base.config.settings</field>
+        <field name="inherit_id" ref="base_setup.view_general_configuration" />
+        <field name="arch" type="xml">
+            <group name="report" position="after">
+                <group name="partner_labels" string="Labels configuration">
+                    <label for="partner_labels_width" />
+                    <div><field name="partner_labels_width" class="oe_inline" /> mm</div>
+                    <label for="partner_labels_height" />
+                    <div><field name="partner_labels_height" class="oe_inline" /> mm</div>
+                    <label for="partner_labels_margin" />
+                    <div><field name="partner_labels_margin" class="oe_inline" /> mm</div>
+                    <label for="partner_labels_padding" />
+                    <div><field name="partner_labels_padding" class="oe_inline" /> mm</div>
+                    <label for="partner_labels_paperformat_id" />
+                    <div>
+                        <field name="partner_labels_paperformat_id" class="oe_inline" />
+                        <button type="object" name="action_partner_labels_preview" string="Preview" />
+                    </div>
                 </group>
-            </field>
-        </record>
-    </data>
-</openerp>
+            </group>
+        </field>
+    </record>
+</odoo>