diff --git a/contracts/integration/MoC/MocIntegration.sol b/contracts/integration/MoC/MocIntegration.sol
index 2cd9746..4f8d89f 100644
--- a/contracts/integration/MoC/MocIntegration.sol
+++ b/contracts/integration/MoC/MocIntegration.sol
@@ -20,7 +20,7 @@ contract MocIntegration is OwnableUpgradeable, ERC1967UpgradeUpgradeable {
 
     address public mocVendorAccount;
 
-    event GetDocFromDllrAndRedeemRBTC(uint256 fromDLLR, uint256 toRBTC);
+    event GetDocFromDllrAndRedeemRBTC(address indexed from, uint256 fromDLLR, uint256 toRBTC);
     event MocVendorAccountSet(address newMocVendorAccount);
 
     /**
@@ -95,7 +95,7 @@ contract MocIntegration is OwnableUpgradeable, ERC1967UpgradeUpgradeable {
         (bool success, ) = msg.sender.call{ value: rbtcAmount }("");
         require(success, "MocIntegration:: error transferring redeemed RBTC");
 
-        emit GetDocFromDllrAndRedeemRBTC(_dllrAmount, rbtcAmount);
+        emit GetDocFromDllrAndRedeemRBTC(msg.sender, _dllrAmount, rbtcAmount);
     }
 
     /// Set MoC registered Vendor account to receive markup fees https://docs.moneyonchain.com/main-rbtc-contract/integration-with-moc-platform/vendors
diff --git a/contracts/meta-asset-token/MetaAssetToken.sol b/contracts/meta-asset-token/MetaAssetToken.sol
index ae65dca..1f06426 100644
--- a/contracts/meta-asset-token/MetaAssetToken.sol
+++ b/contracts/meta-asset-token/MetaAssetToken.sol
@@ -31,7 +31,7 @@ contract MetaAssetToken is ERC20Permit, Ownable {
     /**
      * @dev Emitted when transfer  Manager config is changed.
      */
-    event TransferWithPermit(address _from, address _to, uint256 _amount);
+    event TransferWithPermit(address indexed _from, address indexed _to, uint256 _amount);
 
     // state