diff --git a/src/mail/mail_address_validator.py b/src/mail/mail_address_validator.py
index c82f6e0..aee8a1c 100644
--- a/src/mail/mail_address_validator.py
+++ b/src/mail/mail_address_validator.py
@@ -1,5 +1,7 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 
+from imapclient import IMAPClient
+
 from src.db.mongo_manager import MONGO_STORE_MANAGER
 from src.mail.mail_constants import create_imap
 from src.pojo.mail.mail_pojo import MailAddress
@@ -19,10 +21,15 @@ class MailAddressValidator():
     def is_valid_email_address(self) -> bool:
         # authenticate
         imap = create_imap(self.login)
+        isImapClient = isinstance(imap, IMAPClient)
         isValid = True
         try:
-            type, dat = imap.login(self.login, str(self.password))
-            print("type is " + str(type) + "for:" + self.login)
+            if isImapClient:
+                dat = imap.login(self.login, str(self.password))
+                print("dat is " + str(dat) + "for:" + self.login)
+            else:
+                type, dat = imap.login(self.login, str(self.password))
+                print("type is " + str(type) + "for:" + self.login)
             imap.logout()
         except Exception as error:
             print(error)
@@ -44,7 +51,7 @@ def remove_invalid_email():
 
 def find_and_update_invalid_emails():
     mail_list = MONGO_STORE_MANAGER.get_destination_emails()
-    # mail_address1 = MailAddress(mail="riagiovanni@alice.it", password="26021978")
+    # mail_address1 = MailAddress(mail="perrateke1983@onet.pl", password="8EQh#UuyMx8zVO9")
     # # mail_address2 = MailAddress(mail="chenpeijun@aol.com", password="ytifuwguknzifqyb")
     # # mail_address2 = MailAddress(mail="sdfgfhgf1986@aol.com", password="fjwcgvhxxlywqfwm")
     # # mail_address3 = MailAddress(mail="ciyuexie@aol.com", password="czezlmmyypokdfce")