diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 761a0c8df8bf..87d4fd13d7f9 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -80,8 +80,8 @@ class SetupController extends Controller
             'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false',
             'APP_DEBUG' => $request->input('debug') ? 'true' : 'false',
 
-            'DB_HOST1' => $request->input('host'),
-            'DB_DATABASE1' => $request->input('database'),
+            'DB_HOST1' => $request->input('db_host'),
+            'DB_DATABASE1' => $request->input('db_database'),
             'DB_USERNAME1' => $request->input('db_username'),
             'DB_PASSWORD1' => $request->input('db_password'),
 
@@ -166,6 +166,8 @@ class SetupController extends Controller
      */
     public function checkMail(CheckMailRequest $request)
     {
+        info($request->all());
+
         try {
             $response_array = SystemHealth::testMailServer($request);
 
diff --git a/app/Http/Requests/Setup/CheckMailRequest.php b/app/Http/Requests/Setup/CheckMailRequest.php
index 6ff4640a4095..ecd5df3cc9ab 100644
--- a/app/Http/Requests/Setup/CheckMailRequest.php
+++ b/app/Http/Requests/Setup/CheckMailRequest.php
@@ -36,14 +36,13 @@ class CheckMailRequest extends Request
         info($this->driver);
 
         return [
-            'driver' => ['required', 'in:smtp,mail,sendmail,log'],
-            'from_name' => ['required_unless:driver,log'],
-            'from_address' => ['required_unless:driver,log'],
-            'username' => ['required_unless:driver,log'],
-            'host' => ['required_unless:driver,log'],
-            'port' => ['required_unless:driver,log'],
-            'encryption' => ['required_unless:driver,log'],
-            'password' => ['required_unless:driver,log'],
+            'mail_driver' => 'required',
+            'encryption' => 'required_unless:mail_driver,log',
+            'mail_host' => 'required_unless:mail_driver,log',
+            'mail_username' => 'required_unless:mail_driver,log',
+            'mail_name' => 'required_unless:mail_driver,log',
+            'mail_address' => 'required_unless:mail_driver,log',
+            'mail_password' => 'required_unless:mail_driver,log',
         ];
     }
 }
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index f93a45324ffd..c758d731f76b 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -210,14 +210,14 @@ class SystemHealth
         }
 
         if ($request && $request instanceof CheckMailRequest) {
-            config(['mail.driver' => $request->input('driver')]);
-            config(['mail.host' => $request->input('host')]);
-            config(['mail.port' => $request->input('port')]);
-            config(['mail.from.address' => $request->input('from_address')]);
-            config(['mail.from.name' => $request->input('from_name')]);
+            config(['mail.driver' => $request->input('mail_driver')]);
+            config(['mail.host' => $request->input('mail_host')]);
+            config(['mail.port' => $request->input('mail_port')]);
+            config(['mail.from.address' => $request->input('mail_address')]);
+            config(['mail.from.name' => $request->input('mail_name')]);
             config(['mail.encryption' => $request->input('encryption')]);
-            config(['mail.username' => $request->input('username')]);
-            config(['mail.password' => $request->input('password')]);
+            config(['mail.username' => $request->input('mail_username')]);
+            config(['mail.password' => $request->input('mail_password')]);
         }
 
         try {
diff --git a/resources/js/setup/setup.js b/resources/js/setup/setup.js
index ed088045298f..8d3388919556 100644
--- a/resources/js/setup/setup.js
+++ b/resources/js/setup/setup.js
@@ -39,17 +39,17 @@ class Setup {
 
     handleSmtpCheck() {
         let data = {
-            driver: document.querySelector('select[name="mail_driver"]').value,
-            from_name: document.querySelector('input[name="mail_name"]').value,
-            from_address: document.querySelector('input[name="mail_address"]')
+            mail_driver: document.querySelector('select[name="mail_driver"]').value,
+            mail_name: document.querySelector('input[name="mail_name"]').value,
+            mail_address: document.querySelector('input[name="mail_address"]')
                 .value,
-            username: document.querySelector('input[name="mail_username"]')
+            mail_username: document.querySelector('input[name="mail_username"]')
                 .value,
-            host: document.querySelector('input[name="mail_host"]').value,
-            port: document.querySelector('input[name="mail_port"]').value,
+            mail_host: document.querySelector('input[name="mail_host"]').value,
+            mail_port: document.querySelector('input[name="mail_port"]').value,
             encryption: document.querySelector('select[name="encryption"]')
                 .value,
-            password: document.querySelector('input[name="mail_password"]')
+            mail_password: document.querySelector('input[name="mail_password"]')
                 .value,
         };