diff --git a/partner_firstname/__manifest__.py b/partner_firstname/__manifest__.py
index 256d9984234..e6a25e801c0 100644
--- a/partner_firstname/__manifest__.py
+++ b/partner_firstname/__manifest__.py
@@ -18,7 +18,7 @@
     "maintainer": "Camptocamp, Acsone",
     "category": "Extra Tools",
     "website": "https://github.com/OCA/partner-contact",
-    "depends": ["base_setup"],
+    "depends": ["base_setup", "partner_type_base"],
     "post_init_hook": "post_init_hook",
     "data": [
         "views/base_config_view.xml",
diff --git a/partner_firstname/views/res_partner.xml b/partner_firstname/views/res_partner.xml
index 01c1ba8d250..387cd3957e4 100644
--- a/partner_firstname/views/res_partner.xml
+++ b/partner_firstname/views/res_partner.xml
@@ -4,25 +4,12 @@
         <field name="inherit_id" ref="base.view_partner_simple_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@id='individual']" position="attributes">
-                <attribute name="invisible">is_company</attribute>
-                <attribute name="readonly">not is_company</attribute>
-                <attribute name="required">type == 'contact' and is_company</attribute>
-            </xpath>
-            <xpath expr="//field[@id='company']" position="attributes">
-                <attribute name="invisible">is_company == False</attribute>
-                <attribute name="readonly">not is_company</attribute>
-                <attribute name="required">type == 'contact' and is_company</attribute>
+                <attribute name="readonly">is_individual</attribute>
             </xpath>
             <xpath expr="//h1//field[@id='company']/.." position="before">
-                <group invisible="is_company">
-                    <field
-                        name="lastname"
-                        required="not firstname and not is_company and type == 'contact'"
-                    />
-                    <field
-                        name="firstname"
-                        required="not lastname and not is_company and type == 'contact'"
-                    />
+                <group invisible="not is_individual">
+                    <field name="lastname" required="not firstname and is_individual" />
+                    <field name="firstname" required="not lastname and is_individual" />
                 </group>
             </xpath>
         </field>
@@ -32,54 +19,39 @@
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@id='individual']" position="attributes">
-                <attribute name="invisible">is_company</attribute>
-                <attribute name="readonly">not is_company</attribute>
-                <attribute name="required">type == 'contact' and is_company</attribute>
-            </xpath>
-            <xpath expr="//field[@id='company']" position="attributes">
-                <attribute name="invisible">not is_company</attribute>
-                <attribute name="readonly">not is_company</attribute>
-                <attribute name="required">type == 'contact' and is_company</attribute>
+                <attribute name="readonly">is_individual</attribute>
             </xpath>
             <xpath
                 expr="//div[hasclass('oe_title')]//field[@id='company']/.."
                 position="after"
             >
                 <div class="oe_edit_only">
-                    <group invisible="is_company">
+                    <group invisible="not is_individual">
                         <field
                             name="lastname"
-                            required="not firstname and not is_company and type == 'contact'"
+                            required="not firstname and is_individual"
                         />
                         <field
                             name="firstname"
-                            required="not lastname and not is_company and type == 'contact'"
+                            required="not lastname and is_individual"
                         />
                     </group>
                 </div>
             </xpath>
-            <!-- Modify inner contact form of child_ids -->
-            <xpath
-                expr="//field[@name='child_ids']/form//field[@name='name']"
-                position="attributes"
-            >
-                <attribute name="readonly">not is_company</attribute>
-                <attribute name="required">is_company</attribute>
-            </xpath>
+
             <xpath
                 expr="//field[@name='child_ids']/form//field[@name='name']"
                 position="after"
             >
                 <div class="oe_edit_only" colspan="2">
-                    <field name="is_company" invisible="True" />
-                    <group invisible="is_company">
+                    <group invisible="not is_individual">
                         <field
                             name="lastname"
-                            required="not firstname and not is_company and type == 'contact'"
+                            required="not firstname and is_individual"
                         />
                         <field
                             name="firstname"
-                            required="not lastname and not is_company and type == 'contact'"
+                            required="not lastname and is_individual"
                         />
                     </group>
                 </div>