diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index c7c098f5..6e3d5f27 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -149,7 +149,7 @@ class SetupController extends Controller
             return $input->mail_driver === 'smtp';
         });
 
-        $v->sometimes(['env.mail_from', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
+        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
             return $input->mail_driver !== 'log';
         });
 
@@ -250,8 +250,10 @@ class SetupController extends Controller
         try {
             (new Dotenv($dir, $file))->load();
 
+            $envValue = env(strtoupper($key)) ?: 'null';
+
             file_put_contents($path, str_replace(
-                env(strtoupper($key)), $value, file_get_contents($path)
+                $envValue, $value, file_get_contents($path)
             ));
         } catch (InvalidPathException $e) {
             //
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 867d79c5..fa09b231 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -25,7 +25,7 @@ return [
         'session_driver'   => 'Session Driver',
         'mail_driver'      => 'Mail Driver',
         'mail_host'        => 'Mail Host',
-        'mail_from'        => 'Mail From',
+        'mail_address'     => 'Mail From',
         'mail_username'    => 'Mail Client User',
         'mail_password'    => 'Mail Client Password',
     ],
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index d2f7efcf..f5ff6ad8 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -76,10 +76,10 @@
                         @endif
                     </div>
                     <div class="form-group">
-                        <label>{{ trans('forms.setup.mail_from') }}</label>
-                        <input type="text" class="form-control" name="env[mail_from]" value="{{ Binput::old('env.mail_from') }}" placeholder="notifications@alt-three.com">
-                        @if($errors->has('env.mail_from'))
-                        <span class="text-danger">{{ $errors->first('env.mail_from') }}</span>
+                        <label>{{ trans('forms.setup.mail_address') }}</label>
+                        <input type="text" class="form-control" name="env[mail_address]" value="{{ Binput::old('env.mail_address') }}" placeholder="notifications@alt-three.com">
+                        @if($errors->has('env.mail_address'))
+                        <span class="text-danger">{{ $errors->first('env.mail_address') }}</span>
                         @endif
                     </div>
                     <div class="form-group">