diff --git a/email_service/src/email/email.service.ts b/email_service/src/email/email.service.ts
index 32bcec8..1dd5083 100644
--- a/email_service/src/email/email.service.ts
+++ b/email_service/src/email/email.service.ts
@@ -232,7 +232,7 @@ export class EmailService implements OnModuleInit, OnModuleDestroy {
 
       // Send email
       const info = await this.transporter.sendMail({
-        from: process.env.SMTP_USER,
+        from: process.env.FROM_EMAIL || process.env.SMTP_USER,
         to: message.user_email,
         subject: subject,
         html: html,