diff --git a/addons/crm/views/res_partner_views.xml b/addons/crm/views/res_partner_views.xml
index b6533072df6..7d8721e8aa8 100644
--- a/addons/crm/views/res_partner_views.xml
+++ b/addons/crm/views/res_partner_views.xml
@@ -44,12 +44,6 @@
                             <field string="Opportunities" name="opportunity_count" widget="statinfo"/>
                         </button>
                     </div>
-                    <field name="parent_id" position="before">
-                        <field name="team_id" invisible="1"/>
-                    </field>
-                    <field name="parent_id" position="attributes">
-                        <attribute name="context">{'default_is_company': True, 'show_vat': True, 'default_user_id': user_id, 'default_team_id': team_id}</attribute>
-                    </field>
                 </data>
             </field>
         </record>
diff --git a/addons/sales_team/views/res_partner_views.xml b/addons/sales_team/views/res_partner_views.xml
index ddb55e434e3..ffd0a10e4b9 100644
--- a/addons/sales_team/views/res_partner_views.xml
+++ b/addons/sales_team/views/res_partner_views.xml
@@ -6,8 +6,12 @@
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
             <xpath expr="//page[@name='sales_purchases']//field[@name='user_id']" position="after">
+                <field name="team_id" invisible="1"/>
                 <field name="team_id" groups="base.group_no_one" />
             </xpath>
+            <field name="parent_id" position="attributes">
+                <attribute name="context">{'default_is_company': True, 'show_vat': True, 'default_user_id': user_id, 'default_team_id': team_id}</attribute>
+            </field>
         </field>
     </record>
 </odoo>
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 8463281c80a..50f34bc390b 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -180,7 +180,7 @@
                             <field name="parent_id"
                                 widget="res_partner_many2one"
                                 placeholder="Company Name..."
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'show_vat': True}"
+                                domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'show_vat': True, 'default_user_id': user_id}"
                                 attrs="{'invisible': ['|', '&amp;', ('is_company','=', True),('parent_id', '=', False),('company_name', '!=', False),('company_name', '!=', '')]}"/>
                                 <field name="company_name" attrs="{'invisible': ['|', '|', ('company_name', '=', False), ('company_name', '=', ''), ('is_company', '=', True)]}"/>
                                 <button name="create_company" icon="fa-plus-square" string="Create company"