diff --git a/src/userdb.js b/src/userdb.js
index 7e3b1038b..e2ba2dec9 100644
--- a/src/userdb.js
+++ b/src/userdb.js
@@ -248,6 +248,8 @@ function update(userId, user, callback) {
                 msg = 'email already exists';
             } else if (error.message.indexOf('users_username') !== -1) {
                 msg = 'username already exists';
+            } else {
+                msg = 'mailbox already exists';
             }
 
             return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, msg));