diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
index c3a578914..3cd1d943f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
@@ -38,7 +38,7 @@ public interface RiskAttentionMerchantsMapper {
             "   OR (contact_phone LIKE CONCAT('%',#{contact_phone},'%') ) " +
             "   OR (contact_person LIKE CONCAT('%',#{contact_person},'%') ) " +
             "   OR (client_moniker LIKE CONCAT('%',#{client_moniker},'%') ) " +
-            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) ")
+            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 9556183e0..96e4b9fac 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -2621,12 +2621,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         Assert.notEmpty(client);
         clientModifySupport.processClientModify(new DisableModify(manager, clientMoniker, false));
-        List<String> exceptClientIds = new ArrayList<>();
-        exceptClientIds.add(client.getString("client_id"));
-        JSONObject sameMailClients = getByEmail(client.getString("contact_email"), 1, 1, exceptClientIds);
-        if (sameMailClients.getJSONArray("data").size() < 1) {
-            mailGunService.removeMailList(client);
-        }
     }
 
     @Override