diff --git a/src/ldap.js b/src/ldap.js
index e25e1d404..3d44c1ba1 100644
--- a/src/ldap.js
+++ b/src/ldap.js
@@ -65,7 +65,7 @@ function userSearch(req, res, next) {
                     uid: entry.id,
                     mail: entry.email,
                     // TODO: check mailboxes before we send this
-                    mailAlternateAddress: entry.alternativeEmail,
+                    mailAlternateAddress: entry.alternateEmail,
                     displayname: displayName,
                     givenName: firstName,
                     username: entry.username,
diff --git a/src/mailer.js b/src/mailer.js
index fd80f0fc0..04f3fbffc 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -254,7 +254,7 @@ function sendInvite(user, invitor) {
 
     var mailOptions = {
         from: mailConfig().from,
-        to: user.alternativeEmail || user.email,
+        to: user.alternateEmail || user.email,
         subject: util.format('Welcome to Cloudron %s', config.fqdn()),
         text: render('welcome_user.ejs', templateData)
     };
@@ -278,7 +278,7 @@ function userAdded(user, inviteSent) {
         var mailOptions = {
             from: mailConfig().from,
             to: adminEmails.join(', '),
-            subject: util.format('%s added in Cloudron %s', user.alternativeEmail || user.email, config.fqdn()),
+            subject: util.format('%s added in Cloudron %s', user.alternateEmail || user.email, config.fqdn()),
             text: render('user_added.ejs', { fqdn: config.fqdn(), user: user, inviteLink: inviteLink, format: 'text' }),
         };
 
@@ -312,7 +312,7 @@ function passwordReset(user) {
 
     var mailOptions = {
         from: mailConfig().from,
-        to: user.alternativeEmail || user.email,
+        to: user.alternateEmail || user.email,
         subject: 'Password Reset Request',
         text: render('password_reset.ejs', { fqdn: config.fqdn(), user: user, resetLink: resetLink, format: 'text' })
     };
diff --git a/src/test/user-test.js b/src/test/user-test.js
index 316660ca2..4fbf70f30 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -199,7 +199,7 @@ describe('User', function () {
                 expect(result).to.be.ok();
                 expect(result.username).to.equal(USERNAME.toLowerCase());
                 expect(result.email).to.equal(EMAIL.toLowerCase());
-                expect(result.alternativeEmail).not.to.be.ok();
+                expect(result.alternateEmail).not.to.be.ok();
 
                 // first user is owner, do not send mail to admins
                 checkMails(0, done);
@@ -257,7 +257,7 @@ describe('User', function () {
             });
         });
 
-        it('succeeds and attempts to send invite to alternativeEmail', function (done) {
+        it('succeeds and attempts to send invite to alternateEmail', function (done) {
             // user settingsdb instead of settings, to not trigger further events
             settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: true }), function (error) {
                 expect(error).not.to.be.ok();
@@ -267,7 +267,7 @@ describe('User', function () {
                     expect(result).to.be.ok();
                     expect(result.username).to.equal(USERNAME_1.toLowerCase());
                     expect(result.email).to.equal(USERNAME_1.toLowerCase() + '@' + config.fqdn());
-                    expect(result.alternativeEmail).to.equal(EMAIL_1.toLowerCase());
+                    expect(result.alternateEmail).to.equal(EMAIL_1.toLowerCase());
 
                     // first user is owner, do not send mail to admins
                     checkMails(2, { sentTo: EMAIL_1.toLowerCase() }, function (error) {
@@ -625,7 +625,7 @@ describe('User', function () {
                 expect(result).to.be.ok();
                 expect(result.id).to.equal(userObject.id);
                 expect(result.email).to.equal(EMAIL.toLowerCase());
-                expect(result.alternativeEmail).not.to.be.ok();
+                expect(result.alternateEmail).not.to.be.ok();
                 expect(result.username).to.equal(USERNAME.toLowerCase());
                 expect(result.displayName).to.equal(DISPLAY_NAME);
 
@@ -643,7 +643,7 @@ describe('User', function () {
                     expect(result).to.be.ok();
                     expect(result.id).to.equal(userObject.id);
                     expect(result.email).to.equal(USERNAME.toLowerCase() + '@' + config.fqdn());
-                    expect(result.alternativeEmail).to.equal(EMAIL.toLowerCase());
+                    expect(result.alternateEmail).to.equal(EMAIL.toLowerCase());
                     expect(result.username).to.equal(USERNAME.toLowerCase());
                     expect(result.displayName).to.equal(DISPLAY_NAME);
 
diff --git a/src/user.js b/src/user.js
index a08ec8660..bd8b82dcd 100644
--- a/src/user.js
+++ b/src/user.js
@@ -191,7 +191,7 @@ function createUser(username, password, email, displayName, auditSource, options
                         if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
 
                         if (mailConfig.enabled) {
-                            user.alternativeEmail = user.email;
+                            user.alternateEmail = user.email;
                             user.email = user.username + '@' + config.fqdn();
                         }
 
@@ -316,7 +316,7 @@ function listUsers(callback) {
                 result.admin = result.groupIds.indexOf(constants.ADMIN_GROUP_ID) !== -1;
 
                 if (mailConfig.enabled) {
-                    result.alternativeEmail = result.email;
+                    result.alternateEmail = result.email;
                     result.email = result.username + '@' + config.fqdn();
                 }
             });
@@ -354,7 +354,7 @@ function getUser(userId, callback) {
                 if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
 
                 if (mailConfig.enabled) {
-                    result.alternativeEmail = result.email;
+                    result.alternateEmail = result.email;
                     result.email = result.username + '@' + config.fqdn();
                 }
 
@@ -465,7 +465,7 @@ function getAllAdmins(callback) {
 
             if (mailConfig.enabled) {
                 admins.forEach(function (admin) {
-                    admin.alternativeEmail = admin.email;
+                    admin.alternateEmail = admin.email;
                     admin.email = admin.username + '@' + config.fqdn();
                 });
             }
@@ -580,7 +580,7 @@ function getOwner(callback) {
             if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
 
             if (mailConfig.enabled) {
-                owner.alternativeEmail = owner.email;
+                owner.alternateEmail = owner.email;
                 owner.email = owner.username + '@' + config.fqdn();
             }