diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index eeb37c28d9a..9043bc9abe9 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -140,9 +140,11 @@ class stock_picking(osv.osv):
                 continue
             sale_lines = picking.sale_id.order_line
             invoice_created = invoices[result[picking.id]]
-            for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
-                if not inv.fiscal_position:
-                    invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
+            if picking.sale_id.user_id:
+                invoice_obj.write(cursor, user, [invoice_created.id], {'user_id': picking.sale_id.user_id.id}, context=context)
+
+            if picking.sale_id.fiscal_position:
+                invoice_obj.write(cursor, user, [invoice_created.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
             if picking.sale_id.client_order_ref:
                 inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
                 invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)