diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index 9a88c6e80..2b68113da 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -33,19 +33,19 @@
         </field>
         <!-- Add firstname and last name in inner contact form of child_ids -->
         <xpath expr="//form[@string='Contact']/sheet//field[@name='category_id']" position="before">
-           <group attrs="{'invisible': [('is_company', '=', True)]}">
-            <field name="lastname" attrs="{'required': [('is_company', '=', False)]}"/>
-            <field name="firstname"/>
-           </group> 
+          <group>
+            <label for="lastname" class="oe_edit_only"/>
+            <field name="lastname" required="1" nolabel="1"/>
+            <label for="firstname" class="oe_edit_only"/>
+            <field name="firstname" nolabel="1"/>
+          </group>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet//field[@name='category_id']" position="attributes">
             <attribute name="style"/>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet/div/label" position="replace">
             <div class="oe_edit_only">
-                <label for="name"/> (
-                <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/>
-                <label for="is_company" string="Is a Company?"/>)
+                <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
             </div>
         </xpath>
         <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="attributes">