diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 2176e81a3b0..a5f6ad2cfa6 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -130,7 +130,7 @@ class sale_quote(http.Controller):
         order_line_obj.write(request.cr, SUPERUSER_ID, [line_id], {'product_uom_qty': (quantity)}, context=request.context)
         return [str(quantity), str(order.amount_total)]
 
-    @http.route(["/quote/template/<model('sale.quote.template'):quote>"], type='http', auth="user", website=True)
+    @http.route(["/quote/template/<model('sale.quote.template'):quote>"], type='http', auth="user", website=True, multilang=True)
     def template_view(self, quote, **post):
         values = { 'template': quote }
         return request.website.render('website_quote.so_template', values)
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index 3614fd63919..497bdfdacf1 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -133,6 +133,11 @@ class sale_order(osv.osv):
     def onchange_template_id(self, cr, uid, ids, template_id, partner=False, fiscal_position=False, context=None):
         if not template_id:
             return True
+
+        if context is None:
+            context = {}
+        context = dict(context, lang=self.pool.get('res.partner').browse(cr, uid, partner, context).lang)
+        
         lines = []
         quote_template = self.pool.get('sale.quote.template').browse(cr, uid, template_id, context=context)
         for line in quote_template.quote_line: