diff --git a/crm_department/views/crm_lead_view.xml b/crm_department/views/crm_lead_view.xml
index 26439d894..c934eedd0 100644
--- a/crm_department/views/crm_lead_view.xml
+++ b/crm_department/views/crm_lead_view.xml
@@ -8,7 +8,9 @@
     <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
     <field name="arch" type="xml">
         <field name="phone" position="before">
-            <field name="department"/>
+            <field name="department"
+                   placeholder="Department"
+                   options='{"no_open": True}'/>
         </field>
     </field>
 </record>
@@ -48,7 +50,9 @@
     <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
     <field name="arch" type="xml">
         <field name="phone" position="before">
-            <field name="department"/>
+            <field name="department"
+                   placeholder="Department"
+                   options='{"no_open": True}'/>
         </field>
     </field>
 </record>
diff --git a/crm_department/views/res_partner_view.xml b/crm_department/views/res_partner_view.xml
index a896b98fb..8856abd93 100644
--- a/crm_department/views/res_partner_view.xml
+++ b/crm_department/views/res_partner_view.xml
@@ -9,8 +9,16 @@
     <field name="arch" type="xml">
         <field name="phone" position="before">
             <field name="department"
-                   placeholder="Department"/>
+                   placeholder="Department"
+                   attrs="{'invisible': [('is_company','=', True)]}"
+                   options='{"no_open": True}'/>
         </field>
+        <xpath expr="//field[@name='child_ids']/form//field[@name='phone']" position="before">
+            <field name="department"
+                   placeholder="Department"
+                   attrs="{'invisible': [('is_company','=', True)]}"
+                   options='{"no_open": True}'/>
+        </xpath>
     </field>
 </record>