diff --git a/.env.example b/.env.example
index fb2e0d8ab3..f16ffef92a 100644
--- a/.env.example
+++ b/.env.example
@@ -23,7 +23,7 @@ DEFAULT_FROM_EMAIL=hello@tooljet.io
 SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_DOMAIN=
-SMTP_ADDRESS=
+SMTP_PORT=
 
 # DISABLE USER SIGNUPS (true or false). Default: true
 DISABLE_SIGNUPS=
diff --git a/server/src/services/email.service.ts b/server/src/services/email.service.ts
index 80bc864e56..c3bed530f8 100644
--- a/server/src/services/email.service.ts
+++ b/server/src/services/email.service.ts
@@ -15,9 +15,11 @@ export class EmailService {
   }
 
   async sendEmail(to: string, subject: string, html: string) {
+    const port = +process.env.SMTP_PORT || 587;
     const transporter = nodemailer.createTransport({
       host: process.env.SMTP_DOMAIN,
-      port: process.env.SMTP_PORT || 587,
+      port: port,
+      secure: port == 465,
       auth: {
         user: process.env.SMTP_USERNAME,
         pass: process.env.SMTP_PASSWORD,