diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
old mode 100644
new mode 100755
index 5b78c3d56b83b008a793676b2a0059460d877481..d111eb3bf0cbfe462ef1e1f821354629daa6916c
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -14,7 +14,6 @@ import logging
 import logging.handlers
 import json
 import re
-import email.utils
 from traceback import format_tb
 from collections import namedtuple
 from time import sleep
@@ -1466,9 +1465,8 @@ def modify_client(**kwargs):
         return allowed.match(nsid)
 
     def isValidEmail(mail):
-        mails = (email.utils.parseaddr(m) for m in mail.split(","))
-        allowed = re.compile(r"^[a-zA-Z0-9_.%!+-]+@[a-zA-Z0-9-.]+$")  # just basic check
-        valid = (allowed.match(ms[1]) for ms in mails)
+        allowed = re.compile(r"(^[a-zA-Z0-9_ .%!+-]*(?=<.*>))?(^|(<(?=.*(>))))[a-zA-Z0-9_.%!+-]+@[a-zA-Z0-9-.]+\4?$")   # just basic check
+        valid = (allowed.match(ms.strip())for ms in mail.split(','))
         return all(valid)
 
     def isValidID(id):