diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 4b92bbcd2..9a8d9767f 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -785,6 +785,31 @@ class SeedDMS_Core_User { /* {{{ */
 				}
 			}
 		}
+
+		$receiptStatus = $this->getReceiptStatus();
+		foreach ($receiptStatus["indstatus"] as $ri) {
+			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if(!$res) {
+					return false;
+				}
+			}
+		}
+
+		$revisionStatus = $this->getRevisionStatus();
+		foreach ($revisionStatus["indstatus"] as $ri) {
+			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if(!$res) {
+					return false;
+				}
+			}
+		}
+
 		return true;
 	} /* }}} */
 
@@ -1086,28 +1111,6 @@ class SeedDMS_Core_User { /* {{{ */
 				return false;
 		}
 
-		$receiptStatus = $this->getReceiptStatus();
-		foreach ($receiptStatus["indstatus"] as $ri) {
-			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			$res=$db->getResult($queryStr);
-			if(!$res) {
-				$db->rollbackTransaction();
-				return false;
-			}
-		}
-
-		$revisionStatus = $this->getRevisionStatus();
-		foreach ($revisionStatus["indstatus"] as $ri) {
-			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			$res=$db->getResult($queryStr);
-			if(!$res) {
-				$db->rollbackTransaction();
-				return false;
-			}
-		}
-
 		$db->commitTransaction();
 		return true;
 	} /* }}} */