diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 8c0383acb02..2fa7488a669 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -73,6 +73,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'comment': order.note,
                 'payment_term': pay_term,
                 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
+                'user_id': order.user_id and order.user_id.id or False,
+                'company_id': order.company_id and order.company_id.id or False
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
             return inv_id