diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js
index 91557418a..11017ee4d 100644
--- a/src/routes/test/oauth2-test.js
+++ b/src/routes/test/oauth2-test.js
@@ -1246,6 +1246,7 @@ describe('Password', function () {
         username: 'someusername',
         password: 'passWord%1234',
         email: 'some@email.com',
+        fallbackEmail: 'somefallback@email.com',
         admin: true,
         salt: 'somesalt',
         createdAt: (new Date()).toUTCString(),
diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index 3160d0a2d..745b61aa4 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -27,6 +27,7 @@ describe('Apps', function () {
         username: 'admin123',
         password: 'secret',
         email: 'admin@me.com',
+        fallbackEmail: 'admin@me.com',
         salt: 'morton',
         createdAt: 'sometime back',
         modifiedAt: 'now',
@@ -39,6 +40,7 @@ describe('Apps', function () {
         username: 'uuid213',
         password: 'secret',
         email: 'safe@me.com',
+        fallbackEmail: 'safe@me.com',
         salt: 'morton',
         createdAt: 'sometime back',
         modifiedAt: 'now',
@@ -51,6 +53,7 @@ describe('Apps', function () {
         username: 'uuid2134',
         password: 'secret',
         email: 'safe1@me.com',
+        fallbackEmail: 'safe1@me.com',
         salt: 'morton',
         createdAt: 'sometime back',
         modifiedAt: 'now',
diff --git a/src/test/digest-test.js b/src/test/digest-test.js
index 9595076fb..1d2a4ec54 100644
--- a/src/test/digest-test.js
+++ b/src/test/digest-test.js
@@ -11,21 +11,21 @@ var async = require('async'),
     digest = require('../digest.js'),
     eventlog = require('../eventlog.js'),
     expect = require('expect.js'),
-    mail = require('../mail.js'),
     maildb = require('../maildb.js'),
     mailer = require('../mailer.js'),
     paths = require('../paths.js'),
     safe = require('safetydance'),
     settings = require('../settings.js'),
-    settingsdb = require('../settingsdb.js'),
     updatechecker = require('../updatechecker.js'),
-    user = require('../user.js');
+    user = require('../user.js'),
+    userdb = require('../userdb.js');
 
 // owner
 var USER_0 = {
     username: 'username0',
     password: 'Username0pass?1234',
     email: 'user0@email.com',
+    fallbackEmail: 'user0fallback@email.com',
     displayName: 'User 0'
 };
 
@@ -67,6 +67,15 @@ describe('digest', function () {
             database._clear,
             settings.initialize,
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
+            function (callback) {
+                userdb.getByUsername(USER_0.username, function (error, result) {
+                    if (error) return callback(error);
+
+                    USER_0.id = result.id;
+
+                    user.update(USER_0.id, { fallbackEmail: USER_0.fallbackEmail }, AUDIT_SOURCE, callback);
+                });
+            },
             eventlog.add.bind(null, eventlog.ACTION_UPDATE, AUDIT_SOURCE, { boxUpdateInfo: { sourceTarballUrl: 'xx', version: '1.2.3', changelog: [ 'good stuff' ] } }),
             maildb.update.bind(null, DOMAIN_0.domain, { enabled: true }),
             mailer._clearMailQueue
@@ -107,7 +116,7 @@ describe('digest', function () {
             digest.maybeSend(function (error) {
                 if (error) return done(error);
 
-                checkMails(1, `${USER_0.email}, ${USER_0.username}@${config.fqdn()}`, done);
+                checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done);
             });
         });
 
@@ -117,7 +126,7 @@ describe('digest', function () {
             digest.maybeSend(function (error) {
                 if (error) return done(error);
 
-                checkMails(1, `${USER_0.email}, ${USER_0.username}@${config.fqdn()}`, done);
+                checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done);
             });
         });
 
@@ -130,7 +139,7 @@ describe('digest', function () {
                 digest.maybeSend(function (error) {
                     if (error) return done(error);
 
-                    checkMails(1, `${USER_0.email}, ${USER_0.username}@${DOMAIN_0.domain}`, done);
+                    checkMails(1, `${USER_0.fallbackEmail}, ${USER_0.email}`, done);
                 });
             });
         });
diff --git a/src/test/groups-test.js b/src/test/groups-test.js
index e4be4f41e..4fb2982ca 100644
--- a/src/test/groups-test.js
+++ b/src/test/groups-test.js
@@ -35,6 +35,7 @@ var USER_0 = {
     username: 'uuid213',
     password: 'secret',
     email: 'safe@me.com',
+    fallbackEmail: 'safefallback@me.com',
     admin: false,
     salt: 'morton',
     createdAt: 'sometime back',
@@ -48,6 +49,7 @@ var USER_1 = { // this user has not signed up yet
     username: null,
     password: '',
     email: 'safe2@me.com',
+    fallbackEmail: 'safe2fallback@me.com',
     admin: false,
     salt: 'morton',
     createdAt: 'sometime back',
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 071d8fa95..d9a3e3b57 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -402,10 +402,10 @@ describe('Ldap', function () {
 
                         expect(entries[0].username).to.equal(USER_0.username.toLowerCase());
                         expect(entries[0].mailAlternateAddress).to.equal(USER_0.email.toLowerCase());
-                        expect(entries[0].mail).to.equal(USER_0.username.toLowerCase() + '@example.com');
+                        expect(entries[0].mail).to.equal(USER_0.email.toLowerCase());
                         expect(entries[1].username).to.equal(USER_1.username.toLowerCase());
                         expect(entries[1].mailAlternateAddress).to.equal(USER_1.email.toLowerCase());
-                        expect(entries[1].mail).to.equal(USER_1.username.toLowerCase() + '@example.com');
+                        expect(entries[1].mail).to.equal(USER_1.email.toLowerCase());
 
                         client.unbind();
 
diff --git a/src/user.js b/src/user.js
index 3c1a086a7..52cfe8e89 100644
--- a/src/user.js
+++ b/src/user.js
@@ -351,7 +351,7 @@ function updateUser(userId, data, auditSource, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var error;
-    data = _.pick(data, 'email', 'displayName', 'username');
+    data = _.pick(data, 'email', 'fallbackEmail', 'displayName', 'username');
 
     if (_.isEmpty(data)) return callback();