diff --git a/contract/models/contract.py b/contract/models/contract.py
index af0512c4c..ab0600332 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -436,6 +436,8 @@ class ContractContract(models.Model):
             move_form.invoice_payment_term_id = self.payment_term_id
         if self.fiscal_position_id:
             move_form.fiscal_position_id = self.fiscal_position_id
+        if invoice_type == "out_invoice" and self.user_id:
+            move_form.invoice_user_id = self.user_id
         invoice_vals = move_form._values_to_save(all_fields=True)
         invoice_vals.update(
             {
@@ -445,7 +447,6 @@ class ContractContract(models.Model):
                 "invoice_date": date_invoice,
                 "journal_id": journal.id,
                 "invoice_origin": self.name,
-                "invoice_user_id": self.user_id.id,
             }
         )
         return invoice_vals, move_form
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index aa56a2d67..0347181ae 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -331,7 +331,8 @@ class TestContract(TestContractBase):
         self.contract._recurring_create_invoice()
         invoice_daily = self.contract._get_related_invoices()
         self.assertTrue(invoice_daily)
-        self.assertEquals(self.contract.user_id, invoice_daily.user_id)
+        self.assertEqual(self.contract.user_id, invoice_daily.user_id)
+        self.assertEqual(self.contract.user_id, invoice_daily.invoice_user_id)
 
     def test_contract_weekly_post_paid(self):
         recurring_next_date = to_date("2018-03-01")