diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 0edf88feb4db..6c978e790343 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -194,10 +194,14 @@ public function postStep1()
             return $input->env['mail_driver'] === 'smtp';
         });
 
-        $v->sometimes(['env.mail_address', 'env.mail_username', 'env.mail_password'], 'required', function ($input) {
+        $v->sometimes(['env.mail_address', 'env.mail_password'], 'required', function ($input) {
             return !in_array($input->env['mail_driver'], ['log', 'smtp']);
         });
 
+        $v->sometimes(['env.mail_username'], 'required', function($input) {
+            return !in_array($input->env['mail_username'], ['sendmail']);
+        });
+
         if ($v->passes()) {
             return Response::json(['status' => 1]);
         }