diff --git a/.env.sample b/.env.sample
index 20ab120f..4f290470 100644
--- a/.env.sample
+++ b/.env.sample
@@ -18,5 +18,5 @@ SMTP_HOST=
 SMTP_PORT=
 SMTP_USERNAME=
 SMTP_PASSWORD=
-SMTP_SENDER_EMAIL=
-SMTP_REPLY_TO=
\ No newline at end of file
+SMTP_FROM_EMAIL=
+SMTP_REPLY_EMAIL=
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
index 4ddaf450..feccc0ad 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,7 +10,7 @@ machine:
     DATABASE_URL_TEST: postgres://ubuntu@localhost:5432/circle_test
     DATABASE_URL: postgres://ubuntu@localhost:5432/circle_test
     URL: http://localhost:3000
-    SMTP_SENDER_EMAIL: hello@example.com
+    SMTP_FROM_EMAIL: hello@example.com
 
 dependencies:
   override:
diff --git a/server/mailer.js b/server/mailer.js
index 784913e9..a9d0b88f 100644
--- a/server/mailer.js
+++ b/server/mailer.js
@@ -45,8 +45,8 @@ class Mailer {
 
       try {
         await transporter.sendMail({
-          from: process.env.SMTP_SENDER_EMAIL,
-          replyTo: process.env.SMTP_REPLY_TO || process.env.SMTP_SENDER_EMAIL,
+          from: process.env.SMTP_FROM_EMAIL,
+          replyTo: process.env.SMTP_REPLY_EMAIL || process.env.SMTP_FROM_EMAIL,
           to: data.to,
           subject: data.title,
           html: html,
diff --git a/server/mailer.test.js b/server/mailer.test.js
index b7f0c445..137a8532 100644
--- a/server/mailer.test.js
+++ b/server/mailer.test.js
@@ -6,6 +6,8 @@ describe('Mailer', () => {
   let sendMailOutput;
 
   beforeEach(() => {
+    process.env.SMTP_FROM_EMAIL = 'hello@example.com';
+
     fakeMailer = new Mailer();
     fakeMailer.transporter = {
       sendMail: output => (sendMailOutput = output),
diff --git a/setupJest.js b/setupJest.js
index b7cd6068..b5766c27 100644
--- a/setupJest.js
+++ b/setupJest.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';