diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index 7d7158835a..eaa222be18 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -660,8 +660,6 @@ public class MPayment extends X_C_Payment
              || is_ValueChanged(COLUMNNAME_C_Charge_ID)
              || is_ValueChanged(COLUMNNAME_C_Currency_ID)
              || is_ValueChanged(COLUMNNAME_C_DocType_ID)
-             || is_ValueChanged(COLUMNNAME_C_Invoice_ID)
-             || is_ValueChanged(COLUMNNAME_C_Order_ID)
              || is_ValueChanged(COLUMNNAME_DateAcct)
              || is_ValueChanged(COLUMNNAME_DateTrx)
              || is_ValueChanged(COLUMNNAME_DiscountAmt)
diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
index d38fc37c96..d6185dcac8 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java
@@ -1011,6 +1011,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
 			if (!m_po.save())
 			{
 				success = false;
+				m_docStatus = null;
 				processMsg = "SaveError";
 			}
 			if (!success)