diff --git a/src/config/mail.php b/src/config/mail.php
index 09e2c79..905251e 100644
--- a/src/config/mail.php
+++ b/src/config/mail.php
@@ -55,8 +55,8 @@ return [
             'host'       => env('MAIL_HOST'),
             'port'       => env('MAIL_PORT', 587),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-            'username'   => env('MAIL_USERNAME'),
-            'password'   => env('MAIL_PASSWORD'),
+            'username'   => env('MAIL_SYSTEM_USERNAME', env('MAIL_USERNAME')),
+            'password'   => env('MAIL_SYSTEM_PASSWORD', env('MAIL_PASSWORD')),
             'from'       => [
                 'address' => env('MAIL_SYSTEM_USERNAME', env('MAIL_USERNAME')),
                 'name'    => 'Aziros',
@@ -68,8 +68,8 @@ return [
             'host'       => env('MAIL_HOST'),
             'port'       => env('MAIL_PORT', 587),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-            'username'   => env('MAIL_USERNAME'),
-            'password'   => env('MAIL_PASSWORD'),
+            'username'   => env('MAIL_REMINDER_USERNAME', env('MAIL_USERNAME')),
+            'password'   => env('MAIL_REMINDER_PASSWORD', env('MAIL_PASSWORD')),
             'from'       => [
                 'address' => env('MAIL_REMINDER_USERNAME', env('MAIL_USERNAME')),
                 'name'    => 'Aziros Reminder',
@@ -81,8 +81,8 @@ return [
             'host'       => env('MAIL_HOST'),
             'port'       => env('MAIL_PORT', 587),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-            'username'   => env('MAIL_USERNAME'),
-            'password'   => env('MAIL_PASSWORD'),
+            'username'   => env('MAIL_ARIA_USERNAME', env('MAIL_USERNAME')),
+            'password'   => env('MAIL_ARIA_PASSWORD', env('MAIL_PASSWORD')),
             'from'       => [
                 'address' => env('MAIL_ARIA_USERNAME', env('MAIL_USERNAME')),
                 'name'    => 'Aria',
@@ -94,8 +94,8 @@ return [
             'host'       => env('MAIL_HOST'),
             'port'       => env('MAIL_PORT', 587),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-            'username'   => env('MAIL_USERNAME'),
-            'password'   => env('MAIL_PASSWORD'),
+            'username'   => env('MAIL_HELLO_USERNAME', env('MAIL_USERNAME')),
+            'password'   => env('MAIL_HELLO_PASSWORD', env('MAIL_PASSWORD')),
             'from'       => [
                 'address' => env('MAIL_HELLO_USERNAME', env('MAIL_USERNAME')),
                 'name'    => 'Aziros',