diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index adb4d03259b..991084e80fd 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -441,7 +441,7 @@ class Ecommerce(http.Controller):
         public_id = request.registry['website'].get_public_user(cr, uid, context)
         if not request.uid == public_id:
             partner = orm_user.browse(cr, uid, uid, context).partner_id
-        elif order.partner_id and order.partner_id.id != public_id:
+        elif order.partner_id and (not order.partner_id.user_ids or public_id not in [u.id for u in order.partner_id.user_ids]):
             partner = orm_partner.browse(cr, SUPERUSER_ID, order.partner_id.id, context)
 
         if partner: