diff --git a/partner_firstname/partner_view.xml b/partner_firstname/partner_view.xml
index e13bdc50c..ce99f4438 100644
--- a/partner_firstname/partner_view.xml
+++ b/partner_firstname/partner_view.xml
@@ -5,8 +5,11 @@
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base.view_partner_simple_form"/>
       <field name="arch" type="xml">
+        <field name="name" position="attributes">
+            <attribute name="attrs">{'readonly': [('is_company', '=', False)]}</attribute>
+        </field>
         <field name="category_id" position="before">
-          <group>
+          <group attrs="{'invisible': [('is_company', '=', True)]}">
             <field name="lastname"/>
             <field name="firstname"/>
           </group>
@@ -19,8 +22,11 @@
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
+        <field name="name" position="attributes">
+            <attribute name="attrs">{'readonly': [('is_company', '=', False)]}</attribute>
+        </field>
         <field name="category_id" position="before">
-          <group>
+          <group attrs="{'invisible': [('is_company', '=', True)]}">
             <field name="lastname"/>
             <field name="firstname"/>
           </group>