diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index 04a7b0a5058..291d88a610e 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -306,6 +306,13 @@ class sale_order(osv.osv):
             return True
         return False
 
+    def create(self, cr, uid, values, context=None):
+        if not values.get('template_id'):
+            defaults = self.default_get(cr, uid, ['template_id'], context=context)
+            template_values = self.onchange_template_id(cr, uid, [], defaults.get('template_id'), partner=values.get('partner_id'), fiscal_position=values.get('fiscal_position'), context=context)['value']
+            values = dict(template_values, **values)
+        return super(sale_order, self).create(cr, uid, values, context=context)
+
 
 class sale_quote_option(osv.osv):
     _name = "sale.quote.option"