diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
index e5e49c2eb..244873442 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
@@ -69,6 +69,9 @@ public class GmailBackedPlatformEmailService implements PlatformEmailService {
         try {
             if (smtpCredentialsData.isUseTLS()) {
                 email.getMailSession().getProperties().put("mail.smtp.starttls.enable", "true");
+                email.setSslSmtpPort(smtpCredentialsData.getPort());
+            } else {
+                email.setSmtpPort(Integer.parseInt(smtpCredentialsData.getPort()));
             }
             email.setFrom(smtpCredentialsData.getFromEmail(), smtpCredentialsData.getFromName());