diff --git a/addons/ecommerce/__init__.py b/addons/website_sale/__init__.py
similarity index 100%
rename from addons/ecommerce/__init__.py
rename to addons/website_sale/__init__.py
diff --git a/addons/ecommerce/__openerp__.py b/addons/website_sale/__openerp__.py
similarity index 85%
rename from addons/ecommerce/__openerp__.py
rename to addons/website_sale/__openerp__.py
index c7c862f39e7..a8366e36a24 100644
--- a/addons/ecommerce/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -8,7 +8,7 @@ OpenERP E-Commerce
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale_stock', 'point_of_sale'],
+    'depends': ['website', 'sale', 'point_of_sale'],
     'installable': True,
     'data': [
         'views/ecommerce.xml'
diff --git a/addons/ecommerce/controllers/__init__.py b/addons/website_sale/controllers/__init__.py
similarity index 100%
rename from addons/ecommerce/controllers/__init__.py
rename to addons/website_sale/controllers/__init__.py
diff --git a/addons/ecommerce/controllers/main.py b/addons/website_sale/controllers/main.py
similarity index 94%
rename from addons/ecommerce/controllers/main.py
rename to addons/website_sale/controllers/main.py
index 36cf2695658..916cf5c7bcd 100644
--- a/addons/ecommerce/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -15,6 +15,8 @@ class Ecommerce(http.Controller):
         cr = request.cr
         uid = request.session._uid or openerp.SUPERUSER_ID
         partner_id = request.httprequest.session.get('ecommerce_partner_id', False)
+        if partner_id and not request.registry.get('res.partner').search(cr, uid, [('id', '=', partner_id)]):
+            partner_id = None
         if not partner_id:
             partner_id = request.registry.get('res.users').browse(cr, uid, uid).partner_id.id
             if uid != 1:
@@ -37,7 +39,7 @@ class Ecommerce(http.Controller):
         if not order_id:
             fields = [k for k, v in order_obj._columns.items()]
             order_value = order_obj.default_get(cr, uid, fields, context=context)
-            order_value['partner_id'] = partner_id or request.registry.get('res.users').browse(cr, uid, uid).partner_id.id
+            order_value['partner_id'] = partner_id
             order_value.update(order_obj.onchange_partner_id(cr, uid, [], uid, context=context)['value'])
             order_id = order_obj.create(cr, uid, order_value, context=context)
             request.httprequest.session['ecommerce_order'] = order_id
@@ -69,7 +71,7 @@ class Ecommerce(http.Controller):
             'categories': category_obj.browse(cr, uid, category_ids),
             'products': product_obj.browse(cr, uid, product_ids),
         })
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.page", values)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.page", values)
         return html
 
     @http.route(['/shop/product/<product_id>'], type='http', auth="db")
@@ -83,13 +85,13 @@ class Ecommerce(http.Controller):
         values.update({
             'product': product_obj.browse(cr, uid, product_id),
         })
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.product", values)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.product", values)
         return html
 
     @http.route(['/shop/my_cart'], type='http', auth="db")
     def my_cart(self, offset=0):
         cr, uid, partner_id = self.get_cr_uid()
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.my_cart", self.get_values())
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.my_cart", self.get_values())
         return html
 
     @http.route(['/shop/add_cart'], type='http', auth="db")
@@ -132,7 +134,7 @@ class Ecommerce(http.Controller):
                 order_line_id = order_line_obj.create(cr, uid, values, context=context)
                 order.write({'order_line': [(4, order_line_id)]}, context=context)
 
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.total", self.get_values())
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.total", self.get_values())
 
         return simplejson.dumps({"quantity": quantity, "totalHTML": html})
 
@@ -151,7 +153,7 @@ class Ecommerce(http.Controller):
         if partner_id:
             values['partner'] = partner_obj.browse(cr, uid, partner_id)
 
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.customer", values)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.customer", values)
         return html
 
     @http.route(['/shop/confirm_cart'], type='http', auth="db")
@@ -174,7 +176,7 @@ class Ecommerce(http.Controller):
                 request.httprequest.session['ecommerce_partner_id'] = partner_id
 
         values['partner'] = partner_obj.browse(cr, uid, partner_id)
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.order", values)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.order", values)
         return html
 
     @http.route(['/shop/confirm_order'], type='http', auth="db")
@@ -183,7 +185,7 @@ class Ecommerce(http.Controller):
         values = self.get_values()
         values['order'].write({'state': 'progress'})
         values['partner'] = request.registry.get('res.partner').browse(cr, uid, partner_id)
-        html = request.registry.get("ir.ui.view").render(cr, uid, "ecommerce.thanks", values)
+        html = request.registry.get("ir.ui.view").render(cr, uid, "website_sale.thanks", values)
         request.httprequest.session['ecommerce_order'] = None
         return html
 
diff --git a/addons/ecommerce/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css
similarity index 100%
rename from addons/ecommerce/static/src/css/ecommerce.css
rename to addons/website_sale/static/src/css/ecommerce.css
diff --git a/addons/ecommerce/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass
similarity index 100%
rename from addons/ecommerce/static/src/css/ecommerce.sass
rename to addons/website_sale/static/src/css/ecommerce.sass
diff --git a/addons/ecommerce/static/src/js/ecommerce.js b/addons/website_sale/static/src/js/ecommerce.js
similarity index 100%
rename from addons/ecommerce/static/src/js/ecommerce.js
rename to addons/website_sale/static/src/js/ecommerce.js
diff --git a/addons/ecommerce/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
similarity index 94%
rename from addons/ecommerce/views/ecommerce.xml
rename to addons/website_sale/views/ecommerce.xml
index c7ef32b54ee..c0976f35f71 100644
--- a/addons/ecommerce/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -32,7 +32,7 @@
                             <div class="span4">
                                 <ul class="nav nav-list">
                                 <t t-foreach="categories" t-as="category">
-                                    <t t-call="ecommerce.categories_recursive"/>
+                                    <t t-call="website_sale.categories_recursive"/>
                                 </t>
                                 </ul>
                             </div>
@@ -40,7 +40,7 @@
                                 <t t-raw="shop_content">
                                     <t t-foreach="products" t-as="product">
                                         <t t-set="quantity" t-value="([int(line.product_uom_qty) for line in (order.order_line or []) if line.product_id.id == product.id] + [0])[0]"/>
-                                        <t t-call="ecommerce.products"/>
+                                        <t t-call="website_sale.products"/>
                                     </t>
                                 </t>
                             </div>
@@ -60,7 +60,7 @@
                     <a t-att-href="'/shop/category/%%s' %% category.id"><t t-esc="category.name"/></a>
                     <ul t-if="category.child_id" class="nav nav-list">
                         <t t-foreach="category.child_id" t-as="category">
-                            <t t-call="ecommerce.categories_recursive"/>
+                            <t t-call="website_sale.categories_recursive"/>
                         </t>
                     </ul>
                 </li>
@@ -97,7 +97,7 @@
             <field name="name">product</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
-                <t t-call="ecommerce.page">
+                <t t-call="website_sale.page">
                     <t t-set="title">Product</t>
                     <t t-set="shop_content">
                         <h1><t t-esc="product.name"/></h1>
@@ -116,15 +116,15 @@
             <field name="name">my_cart</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
-                <t t-call="ecommerce.page">
+                <t t-call="website_sale.page">
                     <t t-set="title">My cart</t>
                     <t t-set="shop_content">
                         <t t-foreach="order.order_line or []" t-as="line">
                             <t t-set="product" t-value="line.product_id"/>
                             <t t-set="quantity" t-value="int(line.product_uom_qty)"/>
-                            <t t-call="ecommerce.products"/>
+                            <t t-call="website_sale.products"/>
                         </t>
-                        <t t-call="ecommerce.total"/>
+                        <t t-call="website_sale.total"/>
                         <a t-if="order.order_line" href="/shop/customer"><button class="btn btn-success">Next stage</button></a>
                     </t>
                 </t>
@@ -156,7 +156,7 @@
             <field name="name">customer</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
-                <t t-call="ecommerce.page">
+                <t t-call="website_sale.page">
                     <t t-set="title">Your informations</t>
                     <t t-set="shop_content">
                         <form action="/shop/confirm_cart" method="post" enctype="x-www-form-urlencoded">
@@ -174,7 +174,7 @@
                                 <input name="state" placeholder="State..." t-att-value="partner and partner.state_id and partner.state_id.name_get()[0][1] or ''"/>
                             </address>
                             <button class="btn btn-success">Next stage</button>
-                            <t t-call="ecommerce.total"/>
+                            <t t-call="website_sale.total"/>
                         </form>
                     </t>
                 </t>
@@ -184,7 +184,7 @@
             <field name="name">order</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
-                <t t-call="ecommerce.page">
+                <t t-call="website_sale.page">
                     <t t-set="title">Order</t>
                     <t t-set="shop_content">
                         <t t-foreach="order.order_line or []" t-as="line">
@@ -213,7 +213,7 @@
                                 <t t-esc="partner.state_id and partner.state_id.name_get()[0][1] or ''"/><br/>
                             </address>
                         </div>
-                        <t t-call="ecommerce.total"/>
+                        <t t-call="website_sale.total"/>
                         <a t-if="order.order_line" href="/shop/confirm_order"><button class="btn btn-success">Confirm order</button></a>
                     </t>
                 </t>
@@ -223,7 +223,7 @@
             <field name="name">thanks</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
-                <t t-call="ecommerce.page">
+                <t t-call="website_sale.page">
                     <t t-set="title">Order</t>
                     <t t-set="shop_content">
                         Thanks for your sale order