diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 3b1b2e1d803..44f1fa8efc0 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -61,7 +61,7 @@ class contactus(http.Controller):
         values = {}
 
         values['medium_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'crm.crm_medium_website')
-        values['team_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'website.salesteam_website_sales')
+        values['team_id'] = request.website.salesteam_id.id
 
         for field_name, field_value in kwargs.items():
             if hasattr(field_value, 'filename'):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 3fe12791582..af4bf6f705b 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -586,7 +586,7 @@ class website_sale(http.Controller):
             orm_partner.write(cr, SUPERUSER_ID, [partner_id], billing_info, context=context)
         else:
             # create partner
-            billing_info['team_id'] = request.registry.get('ir.model.data').xmlid_to_res_id(cr, uid, 'website.salesteam_website_sales')
+            billing_info['team_id'] = request.website.salesteam_id.id
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
         # create a new shipping partner
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 8a77cd46d58..e0eaeec4b5a 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -33,6 +33,11 @@
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
             <field name="use_quotations" eval="False"/>
         </record>
+
+        <record model="website" id="website.default_website">
+            <field name="salesteam_id" ref="website.salesteam_website_sales"/>
+        </record>
+
         <record id="wlist0" model="website_pricelist">
             <field name="selectable" eval="True" />
             <field name="website_id" ref="website.default_website" />