diff --git a/src/apps.js b/src/apps.js
index 8b19564aa..e5942b902 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -411,7 +411,7 @@ function get(appId, callback) {
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
             app.iconUrl = getIconUrlSync(app);
-            app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
+            app.fqdn = domains.fqdn(app.location, domainObject);
 
             mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
                 if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -441,7 +441,7 @@ function getByIpAddress(ip, callback) {
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
 
                 app.iconUrl = getIconUrlSync(app);
-                app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
+                app.fqdn = domains.fqdn(app.location, domainObject);
 
                 mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
                     if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -468,7 +468,7 @@ function getAll(callback) {
                 if (error) return iteratorDone(new AppsError(AppsError.INTERNAL_ERROR, error));
 
                 app.iconUrl = getIconUrlSync(app);
-                app.fqdn = domains.fqdn(app.location, app.domain, domainObject);
+                app.fqdn = domains.fqdn(app.location, domainObject);
 
                 mailboxdb.getByOwnerId(app.id, function (error, mailboxes) {
                     if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
@@ -595,7 +595,7 @@ function install(data, auditSource, callback) {
             if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-            var fqdn = domains.fqdn(location, domain, domainObject);
+            var fqdn = domains.fqdn(location, domainObject);
 
             error = validateHostname(location, domain, fqdn);
             if (error) return callback(error);
@@ -731,7 +731,7 @@ function configure(appId, data, auditSource, callback) {
             if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
             if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-            var fqdn = domains.fqdn(location, domain, domainObject);
+            var fqdn = domains.fqdn(location, domainObject);
 
             error = validateHostname(location, domain, fqdn);
             if (error) return callback(error);
@@ -994,7 +994,7 @@ function clone(appId, data, auditSource, callback) {
                 if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
                 if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));
 
-                error = validateHostname(location, domain, domains.fqdn(location, domain, domainObject));
+                error = validateHostname(location, domain, domains.fqdn(location, domainObject));
                 if (error) return callback(error);
 
                 var newAppId = uuid.v4(), manifest = backupInfo.manifest;
diff --git a/src/domains.js b/src/domains.js
index 6fb53e53c..481ac08ca 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -375,8 +375,8 @@ function setAdmin(domain, callback) {
     });
 }
 
-function fqdn(location, domain, domainObject) {
-    return location + (location ? (domainObject.config.hyphenatedSubdomains ? '-' : '.') : '') + domain;
+function fqdn(location, domainObject) {
+    return location + (location ? (domainObject.config.hyphenatedSubdomains ? '-' : '.') : '') + domainObject.domain;
 }
 
 // removes all fields that are strictly private and should never be returned by API calls