diff --git a/modules/invitations/server/controllers/invitations.server.controller.js b/modules/invitations/server/controllers/invitations.server.controller.js
index 748b5575..8a141c03 100644
--- a/modules/invitations/server/controllers/invitations.server.controller.js
+++ b/modules/invitations/server/controllers/invitations.server.controller.js
@@ -303,11 +303,7 @@ exports.sendOfficial = function (req, res) {
             httpTransport = 'https://';
           }
 
-          mtDebug.debugRed(req.app.get('domain'));
-          mtDebug.debugRed(config.domain);
-          mtDebug.debugRed(req.headers.host);
-
-          var baseUrl = req.app.get('domain') || config.domain || httpTransport + req.headers.host;
+          var baseUrl = (httpTransport + req.headers.host) || config.domain;
           res.render(path.resolve('modules/invitations/server/templates/invite-sign-up-email'), {
             to_email: req.body.email,
             name: req.user.displayName,
diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js
index 57564647..ab93f552 100644
--- a/modules/users/server/controllers/users/users.password.server.controller.js
+++ b/modules/users/server/controllers/users/users.password.server.controller.js
@@ -72,11 +72,7 @@ exports.forgot = function (req, res, next) {
         httpTransport = 'https://';
       }
 
-      mtDebug.debugRed(req.app.get('domain'));
-      mtDebug.debugRed(config.domain);
-      mtDebug.debugRed(req.headers.host);
-
-      var baseUrl = req.app.get('domain') || config.domain || httpTransport + req.headers.host;
+      var baseUrl = (httpTransport + req.headers.host) || config.domain;
       res.render(path.resolve('modules/users/server/templates/reset-password-email'), {
         name: user.displayName,
         appName: config.app.title,