diff --git a/History.md b/History.md
index 3e4ae42c7..fce84bf4a 100644
--- a/History.md
+++ b/History.md
@@ -11,7 +11,7 @@ This release features:
 * Support images attachments copy pasting.
 
 Thanks to GitHub users AlexanderS, fisle, floatinghotpot, FuzzyWuzzie, ndarilek,
-and xavierpriour for their contributions.
+SirCmpwn, and xavierpriour for their contributions.
 
 # v0.9
 
diff --git a/config/accounts.js b/config/accounts.js
index d475e6b2e..b1a4a1779 100644
--- a/config/accounts.js
+++ b/config/accounts.js
@@ -46,3 +46,9 @@ AccountsTemplates.configureRoute('changePwd', {
     Popup.back();
   },
 });
+
+if (Meteor.isServer) {
+  if (process.env.MAIL_FROM) {
+    Accounts.emailTemplates.from = process.env.MAIL_FROM;
+  }
+}