diff --git a/.env b/.env
index b076f0ea91..6ef35b57c1 100644
--- a/.env
+++ b/.env
@@ -55,8 +55,8 @@ _APP_STATSD_PORT=8125
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
-_APP_SMTP_USERNAME=user
-_APP_SMTP_PASSWORD=password
+_APP_SMTP_USERNAME=
+_APP_SMTP_PASSWORD=
 _APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
 _APP_STORAGE_LIMIT=30000000
diff --git a/app/init.php b/app/init.php
index e36bcf0261..e7421b275c 100644
--- a/app/init.php
+++ b/app/init.php
@@ -807,7 +807,7 @@ $register->set('smtp', function () {
     $mail->XMailer = 'Appwrite Mailer';
     $mail->Host = App::getEnv('_APP_SMTP_HOST', 'smtp');
     $mail->Port = App::getEnv('_APP_SMTP_PORT', 25);
-    $mail->SMTPAuth = (!empty($username) && !empty($password));
+    $mail->SMTPAuth = !empty($username) && !empty($password);
     $mail->Username = $username;
     $mail->Password = $password;
     $mail->SMTPSecure = App::getEnv('_APP_SMTP_SECURE', '');
diff --git a/tests/e2e/Scopes/ProjectCustom.php b/tests/e2e/Scopes/ProjectCustom.php
index 0c024e9e03..408b8c8fe7 100644
--- a/tests/e2e/Scopes/ProjectCustom.php
+++ b/tests/e2e/Scopes/ProjectCustom.php
@@ -120,8 +120,8 @@ trait ProjectCustom
             'senderName' => 'Mailer',
             'host' => 'maildev',
             'port' => 1025,
-            'username' => 'user',
-            'password' => 'password',
+            'username' => '',
+            'password' => '',
         ]);
 
         $project = [