diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 239c0913..363b6643 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -145,11 +145,17 @@ class SetupController extends Controller
         $v = Validator::make($postData, $this->rulesStep1);
 
         $v->sometimes('env.mail_host', 'required', function ($input) {
-            return $input->mail_driver === 'smtp';
+            return $input->env['mail_driver'] === 'smtp';
         });
 
-        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
-            return $input->mail_driver !== 'log';
+        $v->sometimes('env.mail_address', 'required', function ($input) {
+            return $input->env['mail_driver'] !== 'log';
+        });
+        $v->sometimes('env.mail_username', 'required', function ($input) {
+            return $input->env['mail_driver'] !== 'log';
+        });
+        $v->sometimes('env.mail_password', 'required', function ($input) {
+            return $input->env['mail_driver'] !== 'log';
         });
 
         if ($v->passes()) {