diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index 973554e70..8f0368373 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -32,10 +32,18 @@
           </group>
         </field>
         <!-- Add firstname and last name in inner contact form of child_ids -->
-        <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="after">
-            <field name="lastname"/>
+        <xpath expr="//form[@string='Contact']/sheet/div" position="after">
+           <group attrs="{'invisible': [('is_company', '=', True)]}">
+            <field name="lastname" attrs="{'required': [('is_company', '=', False)]}"/>
             <field name="firstname"/>
+           </group> 
+        </xpath>
+        <xpath expr="//form[@string='Contact']/sheet/div/h1" position="after">
+           <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/>
+           <label for="is_company" string="Is a Company?"/>)
         </xpath>
+
+
       </field>
     </record>