diff --git a/addons/auth_signup/views/res_config_settings_views.xml b/addons/auth_signup/views/res_config_settings_views.xml
index 7027c2b0bad..0f4a5810ce8 100644
--- a/addons/auth_signup/views/res_config_settings_views.xml
+++ b/addons/auth_signup/views/res_config_settings_views.xml
@@ -19,11 +19,7 @@
                                 <field name="auth_signup_uninvited" class="o_light_label" widget="radio" required="True"/>
                             </div>
                             <div class="content-group" attrs="{'invisible': [('auth_signup_uninvited','=','b2b')]}">
-                                <div class="mt16" groups="base.group_no_one"
-                                        attrs="{'invisible': [('auth_signup_template_user_id', '!=', False)]}">
-                                    Copy access rights from <field name="auth_signup_template_user_id"/>
-                                </div>
-                                <div  class="mt16" attrs="{'invisible': [('auth_signup_template_user_id', '=', False)]}">
+                                <div class="mt16">
                                     <button type="object" name="open_template_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
                                 </div>
                             </div>
diff --git a/addons/crm/data/crm_data.xml b/addons/crm/data/crm_data.xml
index 5f1bfe35f86..cea07019442 100644
--- a/addons/crm/data/crm_data.xml
+++ b/addons/crm/data/crm_data.xml
@@ -6,6 +6,7 @@
             <field name="use_leads">True</field>
             <field name="alias_name">sales</field>
             <field name="dashboard_graph_model">crm.opportunity.report</field>
+            <field name="company_id" eval="False"/>
         </record>
 
         <!--default alias for leads-->
diff --git a/addons/project_timesheet_holidays/models/res_company.py b/addons/project_timesheet_holidays/models/res_company.py
index 3cca96aff82..0eb9e4e3686 100644
--- a/addons/project_timesheet_holidays/models/res_company.py
+++ b/addons/project_timesheet_holidays/models/res_company.py
@@ -40,6 +40,7 @@ class Company(models.Model):
                     'name': _('Leaves'),
                     'project_id': company.leave_timesheet_project_id.id,
                     'active': False,
+                    'company_id': False,
                 })
                 company.write({
                     'leave_timesheet_task_id': task.id,
diff --git a/addons/sales_team/data/sales_team_demo.xml b/addons/sales_team/data/sales_team_demo.xml
index f9a6ff2c52d..91ea15a5470 100644
--- a/addons/sales_team/data/sales_team_demo.xml
+++ b/addons/sales_team/data/sales_team_demo.xml
@@ -5,6 +5,7 @@
         <record model="crm.team" id="team_sales_department">
             <field name="name">Europe</field>
             <field name="dashboard_graph_group">week</field>
+            <field name="company_id" eval="False"/>
         </record>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('sales_team.group_sale_salesman'))]"/>
@@ -17,6 +18,7 @@
         <record model="crm.team" id="crm_team_1">
             <field name="name">America</field>
             <field name="dashboard_graph_group">week</field>
+            <field name="company_id" eval="False"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 910a5f95cfd..81639c17cd0 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -31,6 +31,7 @@
             <field name="active" eval="True"/>
             <field name="dashboard_graph_model">sale.report</field>
             <field name="dashboard_graph_period">week</field>
+            <field name="company_id" eval="False"/>
         </record>
 
         <record model="website" id="website.default_website">