diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 98eae2f72..e538f8656 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -200,21 +200,17 @@ describe('Ldap', function () {
             });
         });
 
-        it('succeeds with both emails and without accessRestriction when email is enabled', function (done) {
+        it('succeeds without accessRestriction when email is enabled', 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();
 
                 var client = ldap.createClient({ url: 'ldap://127.0.0.1:' + config.get('ldapPort') });
 
-                client.bind('cn=' + USER_0.email.toLowerCase() + ',ou=users,dc=cloudron', USER_0.password, function (error) {
+                client.bind('cn=' + USER_0.username.toLowerCase() + '@' + config.fqdn() + ',ou=users,dc=cloudron', USER_0.password, function (error) {
                     expect(error).to.be(null);
 
-                    client.bind('cn=' + USER_0.username.toLowerCase() + '@' + config.fqdn() + ',ou=users,dc=cloudron', USER_0.password, function (error) {
-                        expect(error).to.be(null);
-
-                        settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
-                    });
+                    settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
                 });
             });
         });
diff --git a/src/test/user-test.js b/src/test/user-test.js
index d9fa9858b..316660ca2 100644
--- a/src/test/user-test.js
+++ b/src/test/user-test.js
@@ -577,21 +577,30 @@ describe('User', function () {
             });
         });
 
-        it('succeeds for both emails with cloudron mail', function (done) {
+        it('succeeds with cloudron mail enabled', 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();
 
-                user.verifyWithEmail(EMAIL, PASSWORD, function (error, result) {
+                user.verifyWithEmail(USERNAME + '@' + config.fqdn(), PASSWORD, function (error, result) {
                     expect(error).to.not.be.ok();
                     expect(result).to.be.ok();
 
-                    user.verifyWithEmail(USERNAME + '@' + config.fqdn(), PASSWORD, function (error, result) {
-                        expect(error).to.not.be.ok();
-                        expect(result).to.be.ok();
+                    settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
+                });
+            });
+        });
 
-                        settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
-                    });
+        it('fails with cloudron mail enabled and invite email', 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();
+
+                user.verifyWithEmail(EMAIL, PASSWORD, function (error) {
+                    expect(error).to.be.a(UserError);
+                    expect(error.reason).to.equal(UserError.NOT_FOUND);
+
+                    settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
                 });
             });
         });