diff --git a/src/ldap.js b/src/ldap.js
index a881e572a..13aaa9871 100644
--- a/src/ldap.js
+++ b/src/ldap.js
@@ -271,9 +271,9 @@ function mailboxSearch(req, res, next) {
             attributes: {
                 objectclass: ['mailbox'],
                 objectcategory: 'mailbox',
-                cn: mailbox.name,
-                uid: mailbox.name,
-                mail: mailbox.name + '@' + mailbox.domain,
+                cn: `${mailbox.name}@${mailbox.domain}`,
+                uid: `${mailbox.name}@${mailbox.domain}`,
+                mail: `${mailbox.name}@${mailbox.domain}`,
                 ownerType: mailbox.ownerType
             }
         };
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index d21118769..6e7c10fde 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -733,7 +733,7 @@ describe('Ldap', function () {
             ldapSearch('cn=' + USER_0.username + '@example.com,ou=mailboxes,dc=cloudron', 'objectclass=mailbox', function (error, entries) {
                 if (error) return done(error);
                 expect(entries.length).to.equal(1);
-                expect(entries[0].cn).to.equal(USER_0.username.toLowerCase());
+                expect(entries[0].cn).to.equal(USER_0.username.toLowerCase() + '@example.com');
                 done();
             });
         });