diff --git a/contracts/polygon/connectors/aave/v3-import/helpers.sol b/contracts/polygon/connectors/aave/v3-import/helpers.sol
index 84e3060d..70470303 100644
--- a/contracts/polygon/connectors/aave/v3-import/helpers.sol
+++ b/contracts/polygon/connectors/aave/v3-import/helpers.sol
@@ -355,7 +355,7 @@ contract AaveHelpers is Helper {
 						0,
 						0
 					);
-					_tokens[_cntr] = _token;
+					_tokens[_cntr] = tokens[i];
 					_cntr++;
 				}
 			}
diff --git a/contracts/polygon/connectors/aave/v3-import/main.sol b/contracts/polygon/connectors/aave/v3-import/main.sol
index 9229b8e3..ff56eec9 100644
--- a/contracts/polygon/connectors/aave/v3-import/main.sol
+++ b/contracts/polygon/connectors/aave/v3-import/main.sol
@@ -21,6 +21,11 @@ contract AaveV3ImportResolver is AaveHelpers {
 				AccountInterface(address(this)).isAuth(userAccount),
 				"user-account-not-auth"
 			);
+		} else {
+			require(
+				AccountInterface(userAccount).isAuth(address(this)),
+				"user-account-not-auth"
+			);
 		}
 		require(inputData.supplyTokens.length > 0, "0-length-not-allowed");
 
@@ -98,10 +103,17 @@ contract AaveV3ImportResolver is AaveHelpers {
 		ImportInputData memory inputData,
 		bool[] memory enableCollateral
 	) internal returns (string memory _eventName, bytes memory _eventParam) {
-		require(
-			AccountInterface(address(this)).isAuth(userAccount),
-			"user-account-not-auth"
-		);
+		if (instaList.accountID(userAccount) == 0) {
+			require(
+				AccountInterface(address(this)).isAuth(userAccount),
+				"user-account-not-auth"
+			);
+		} else {
+			require(
+				AccountInterface(userAccount).isAuth(address(this)),
+				"user-account-not-auth"
+			);
+		}
 
 		require(inputData.supplyTokens.length > 0, "0-length-not-allowed");
 		require(