diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index cd0127a07f2..656ede3ce93 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -23,10 +23,8 @@ from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
-from openerp.addons import website_sale
 from openerp.addons.website.models import website
 from openerp.addons.website.controllers.main import Website as controllers
-from openerp.addons.website_sale.controllers.main import Ecommerce as Ecommerce
 controllers = controllers()
 
 
@@ -192,7 +190,7 @@ class website_event(http.Controller):
 
         order = request.context['website_sale_order']
         if not order:
-            order = website_sale.controllers.main.get_order()
+            order = request.registry['website']._get_order(request.cr, request.uid, context=request.context)
 
         partner_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid,
                                      context=request.context).partner_id.id
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 61f1478fb40..8625fa7a29c 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -464,6 +464,8 @@ class Ecommerce(http.Controller):
 
         if 'promo' in post:
             self.change_pricelist(post.get('promo'))
+        else:
+            self.get_pricelist()
 
         suggested_ids = []
         product_ids = []
@@ -518,6 +520,8 @@ class Ecommerce(http.Controller):
         tx = context.get('website_sale_transaction')
         if tx and tx.state != 'draft':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
+        
+        self.get_pricelist()
 
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')