diff --git a/src/ldap.js b/src/ldap.js
index 681fd7a17..0fd71cb82 100644
--- a/src/ldap.js
+++ b/src/ldap.js
@@ -183,7 +183,7 @@ function mailAliasSearch(req, res, next) {
                 objectclass: ['nisMailAlias'],
                 objectcategory: 'nisMailAlias',
                 cn: alias.name,
-                rfc822MailMember: alias.aliasTarget
+                rfc822MailMember: alias.aliasTarget + '@' + config.fqdn()
             }
         };
 
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 6f3af1e8e..fcc8b0b0a 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -547,7 +547,7 @@ describe('Ldap', function () {
                 if (error) return done(error);
                 expect(entries.length).to.equal(1);
                 expect(entries[0].cn).to.equal('asterix');
-                expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase());
+                expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase() + '@' + config.fqdn());
                 done();
             });
         });
@@ -566,7 +566,7 @@ describe('Ldap', function () {
                 if (error) return done(error);
                 expect(entries.length).to.equal(1);
                 expect(entries[0].cn).to.equal('asterix');
-                expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase());
+                expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase() + '@' + config.fqdn());
                 done();
             });
         });