diff --git a/utils/email/validator.ts b/utils/email/validator.ts
index cbca3e3f..541b2fad 100644
--- a/utils/email/validator.ts
+++ b/utils/email/validator.ts
@@ -3,7 +3,7 @@ import {Email} from "./email";
 export class Validator {
 
   //private static regex = "^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$";
-  private static regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
+  private static regex = /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$/;
   /*
   private static regex2= /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   // for expanation paste it in https://www.regextester.com/
@@ -13,21 +13,14 @@ export class Validator {
   public static hasValidEmails(data: any): boolean {
     for(let i = 0; i < data.length; i++) {
       if (!this.emailValidator(data[i])) {
-        // TODO remove console message after final testing
-        //console.log("INVALID EMAIL: "+data[i]);
         return false;
       }
     }
-    // TODO remove console message after final testing
-    //console.log("ALL EMAILS ARE VALID");
     return true;
   }
 
   public static emailValidator(email: any): boolean {
-    if (email.match(this.regex))
-        return true;
-    else
-        return false;
+    return !!email.match(this.regex);
   }
 
 }