diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 1ebfd5ccbdeb2a8d635f75ef9740375da1396aa0..bbf9f5c3e8d776bc666bf675c97a8210d7203ff6 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -1339,9 +1339,10 @@ def modify_client(**kwargs):
         return allowed.match(nsid)
 
     def isValidEmail(mail):
-        split = email.utils.parseaddr(mail)
+        mails = (email.utils.parseaddr(m) for m in mail.split(","))
         allowed = re.compile("^[a-zA-Z0-9_.%!+-]+@[a-zA-Z0-9-.]+$") # just basic check
-        return allowed.match(split[1])
+        valid = (allowed.match(ms[1]) for ms in mails)
+        return all(valid)
 
     def isValidID(id):
         client = server.handler.db.get_clients(id)