diff --git a/account.py b/account.py
index bb4977cd74..5ab10f54f3 100644
--- a/account.py
+++ b/account.py
@@ -139,8 +139,13 @@ class Invoice(metaclass=PoolMeta):
                     continue
                 if payment.party != line.party:
                     continue
+                if (getattr(payment, 'account')
+                        and payment.account != line.account):
+                    continue
                 if payment.amount <= payment_amount:
                     payment.line = line
+                    if hasattr(payment, 'account'):
+                        payment.account = None
                     payment_amount -= payment.amount
         return payments