diff --git a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
index 10586bc41a..93ac09b0fc 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
@@ -67,6 +67,9 @@ public class TbMailSender extends JavaMailSenderImpl {
         if (jsonConfig.has("password")) {
             setPassword(jsonConfig.get("password").asText());
         }
+        if (jsonConfig.has("mailFrom")) {
+            setUsername(jsonConfig.get("mailFrom").asText());
+        }
         setJavaMailProperties(createJavaMailProperties(jsonConfig));
     }