diff --git a/src/mail.js b/src/mail.js
index 60333ddd3..f56edfd3a 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -1237,10 +1237,7 @@ function addList(name, domain, members, auditSource, callback) {
     if (error) return callback(error);
 
     for (var i = 0; i < members.length; i++) {
-        members[i] = members[i].toLowerCase();
-
-        error = validateName(members[i]);
-        if (error) return callback(error);
+        if (!validator.isEmail(members[i])) return callback(new MailError(MailError.BAD_FIELD, 'Invalid mail member: ' + members[i]));
     }
 
     mailboxdb.addList(name, domain, members, function (error) {
@@ -1265,7 +1262,7 @@ function updateList(name, domain, members, callback) {
     if (error) return callback(error);
 
     for (var i = 0; i < members.length; i++) {
-        if (!validator.isEmail(members[i])) return new MailError(MailError.BAD_FIELD, 'Invalid email: ' + members[i]);
+        if (!validator.isEmail(members[i])) return callback(new MailError(MailError.BAD_FIELD, 'Invalid email: ' + members[i]));
     }
 
     mailboxdb.updateList(name, domain, members, function (error) {
diff --git a/src/routes/mail.js b/src/routes/mail.js
index 8cf28e000..a3f34d292 100644
--- a/src/routes/mail.js
+++ b/src/routes/mail.js
@@ -350,6 +350,7 @@ function addList(req, res, next) {
 
     if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
     if (!Array.isArray(req.body.members)) return next(new HttpError(400, 'members must be a string'));
+    if (req.body.members.length === 0) return next(new HttpError(400, 'list must have atleast one member'));
 
     for (var i = 0; i < req.body.members.length; i++) {
         if (typeof req.body.members[i] !== 'string') return next(new HttpError(400, 'member must be a string'));
@@ -370,6 +371,7 @@ function updateList(req, res, next) {
     assert.strictEqual(typeof req.params.name, 'string');
 
     if (!Array.isArray(req.body.members)) return next(new HttpError(400, 'members must be a string'));
+    if (req.body.members.length === 0) return next(new HttpError(400, 'list must have atleast one member'));
 
     for (var i = 0; i < req.body.members.length; i++) {
         if (typeof req.body.members[i] !== 'string') return next(new HttpError(400, 'member must be a string'));