diff --git a/src/emailer.js b/src/emailer.js
index 2e1318d0cc..d63aa1bb7e 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -2,9 +2,11 @@
 
 var	async = require('async'),
 	winston = require('winston'),
+	nconf = require('nconf'),
 	templates = require('templates.js'),
 	nodemailer = require('nodemailer'),
 	htmlToText = require('html-to-text'),
+	url = require('url'),
 
 	User = require('./user'),
 	Plugins = require('./plugins'),
@@ -66,10 +68,9 @@ var	async = require('async'),
 				}, next);
 			},
 			function (results, next) {
-
 				var data = {
 					to: email,
-					from: meta.config['email:from'] || 'no-reply@localhost.lan',
+					from: meta.config['email:from'] || 'no-reply@' + getHostname(),
 					from_name: meta.config['email:from_name'] || 'NodeBB',
 					subject: results.subject,
 					html: results.html,
@@ -129,5 +130,12 @@ var	async = require('async'),
 		], callback);
 	}
 
+	function getHostname() {
+		var configUrl = nconf.get('url'),
+			parsed = url.parse(configUrl);
+
+		return parsed.hostname;
+	};
+
 }(module.exports));