diff --git a/src/emailer.js b/src/emailer.js
index a4f2c407bd..14c683d640 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -71,6 +71,7 @@ var	fs = require('fs'),
 					Plugins.fireHook('action:email.send', {
 						to: email,
 						from: meta.config['email:from'] || 'no-reply@localhost.lan',
+						from_name: meta.config['email:from_name'] || 'NodeBB',
 						subject: translated[2],
 						html: translated[0],
 						plaintext: translated[1],
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index e86eba17cc..6d996900e4 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -14,6 +14,13 @@
 				</p>
 				<input type="text" class="form-control input-lg" id="email:from" data-field="email:from" placeholder="info@example.org" /><br />
 			</div>
+			<div class="form-group">
+				<label for="email:from_name"><strong>From Name</strong></label>
+				<p class="help-block">
+					The from name to display in the email.
+				</p>
+				<input type="text" class="form-control input-lg" id="email:from_name" data-field="email:from_name" placeholder="NodeBB" /><br />
+			</div>
 			<button class="btn btn-block btn-default" type="button" data-action="email.test">Send Test Email</button>
 			<p class="help-block">
 				The test email will be sent to the currently logged in user's email address.