diff --git a/.env.example b/.env.example
index 80afb6274..088507b28 100644
--- a/.env.example
+++ b/.env.example
@@ -73,3 +73,5 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM=null
+MAIL_FROM_NAME=null
diff --git a/config/mail.php b/config/mail.php
index 0386e0198..689be99b8 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -54,7 +54,7 @@ return [
     |
     */
 
-    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => 'BookStack'],
+    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => env('MAIL_FROM_NAME','BookStack')],
 
     /*
     |--------------------------------------------------------------------------