diff --git a/packages/server/.env-example b/packages/server/.env-example
index 186f942a0..45e96824a 100644
--- a/packages/server/.env-example
+++ b/packages/server/.env-example
@@ -36,6 +36,7 @@ EMAIL=false
 # EMAIL_PORT="-> FILL IN <-"
 # EMAIL_USERNAME="-> FILL IN <-"
 # EMAIL_PASSWORD="-> FILL IN <-"
+# EMAIL_FROM="-> FILL IN <-"
 
 ############################################################
 # Auth strategies
diff --git a/packages/server/modules/emails/index.js b/packages/server/modules/emails/index.js
index b5dfb21f8..e390284d4 100644
--- a/packages/server/modules/emails/index.js
+++ b/packages/server/modules/emails/index.js
@@ -57,8 +57,9 @@ exports.sendEmail = async( { from, to, subject, text, html } ) => {
   }
 
   try {
+    let email_from = process.env.EMAIL_FROM || 'no-reply@speckle.systems'
     let info = await transporter.sendMail( {
-      from: from || '"Speckle" <no-reply@speckle.systems>',
+      from: from || `"Speckle" <${email_from}>`,
       to,
       subject,
       text,
@@ -68,6 +69,6 @@ exports.sendEmail = async( { from, to, subject, text, html } ) => {
       debug( 'speckle:test' )( nodemailer.getTestMessageUrl( info ) )
     }
   } catch ( e ) {
-
+    debug( 'speckle:errors' )( e )
   }
 }