diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 1f1901ab423..e22582fd77e 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -540,7 +540,10 @@
                           <tr style="border-top: 1px solid #000" id="order_total">
                               <th><h3>Total:</h3></th>
                               <th class="text-right">
-                                <h3><t t-call="website_sale.total"/></h3>
+                                <h3><span t-field="website_sale_order.amount_total" t-field-options='{
+                                    "widget": "monetary",
+                                    "display_currency": "website.pricelist_id.currency_id"
+                                  }'/></h3>
                               </th>
                           </tr>
                           <tr class="text-muted" id="order_total_taxes">
@@ -1060,11 +1063,5 @@
   </t>
 </template>
 
-<template id="total">
-<span t-field="website_sale_order.amount_total" t-field-options='{
-    "widget": "monetary",
-    "display_currency": "website.pricelist_id.currency_id"
-  }'/>
-</template>
 </data>
 </openerp>
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 9c688cc1b97..43895f73263 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -18,6 +18,7 @@ class Ecommerce(Ecommerce):
             SaleOrder = request.registry['sale.order']
             SaleOrder.write(cr, SUPERUSER_ID, [order.id], {'carrier_id': carrier_id}, context=context)
             SaleOrder.delivery_set(cr, SUPERUSER_ID, [order.id], context=context)
+            return request.redirect("/shop/payment/")
 
         res = super(Ecommerce, self).payment(**post)
         return res