diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 8500b182c9..3172243894 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -108,11 +108,11 @@ class SettingsController extends Controller
         if (!config('app.lock_passwords')) {
             try {
                 Mail::send('emails.test', [], function ($m) {
-                    $m->to(config('mail.from.address'), config('mail.from.name'));
+                    $m->to(config('mail.reply_to.address'), config('mail.reply_to.name'));
                     $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
                     $m->subject(trans('mail.test_email'));
                 });
-                return response()->json(['message' => 'Mail sent to '.config('mail.from.address')], 200);
+                return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
             } catch (Exception $e) {
                 return response()->json(['message' => $e->getMessage()], 500);
             }
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 99bbc17a40..67ebadeeb8 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -194,7 +194,7 @@
                                <div id="mailteststatus-error" class="text-danger"></div>
                            </div>
                            <div class="col-md-9 col-md-offset-3">
-                               <p class="help-block">This will attempt to send a test mail to {{ config('mail.from.address') }}.</p>
+                               <p class="help-block">This will attempt to send a test mail to {{ config('mail.reply_to.address') }}.</p>
                            </div>
 
                        </div>