diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
index 11a431eb..74731668 100644
--- a/app/Http/Controllers/Auth/RegisteredUserController.php
+++ b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -67,8 +67,8 @@ public function store(Request $request)
                 ]);
 
                 // Send welcome mail
-                if (env('MAIL_USERNAME')) {
-                    if (env('QUEUE_MAIL')) {
+                if (config('mail.mailers.smtp.username')) {
+                    if (config('mail.queue_mail')) {
                         Mail::to($request->email)->queue(new RegistrationMail($code));
                     } else {
                         Mail::to($request->email)->send(new RegistrationMail($code));
@@ -118,8 +118,8 @@ public function otpResend(Request $request)
             'name' => $request->name,
         ];
 
-        if (env('MAIL_USERNAME')) {
-            if (env('QUEUE_MAIL')) {
+        if (config('mail.mailers.smtp.username')) {
+            if (config('mail.queue_mail')) {
                 Mail::to($request->email)->queue(new WelcomeMail($data));
             } else {
                 Mail::to($request->email)->send(new WelcomeMail($data));
@@ -290,7 +290,7 @@ public function getOtpTimeInSeconds()
 
         $time = $otpSettings['otp_expiration_time'] ?? null;
         $durationType = $otpSettings['otp_duration_type'] ?? 'minute';
-        $defaultFromEnv = env('OTP_VISIBILITY_TIME', 3);
+        $defaultFromEnv = config('mail.otp_visibility_time', 3);
 
         // Use default if DB value is null
         if (empty($time)) {
diff --git a/config/mail.php b/config/mail.php
index 534395a3..37e1b309 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -115,4 +115,8 @@
         ],
     ],
 
+    'queue_mail' => env('QUEUE_MAIL', false),
+
+    'otp_visibility_time' => env('OTP_VISIBILITY_TIME', 3),
+
 ];