Fix isEmailEnabled

3 years ago · 12e169fae1
1 changed files with 1 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
+++ b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
@ -146,7 +146,7 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
        AdminSettings mailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
        if (mailSettings != null) {
            JsonNode mailFrom = mailSettings.getJsonValue().get("mailFrom");
-            return StringUtils.isNotEmpty(mailFrom.asText());
+            return StringUtils.isNotEmpty(mailFrom.asText()) && !"ThingsBoard <sysadmin@localhost.localdomain>".equalsIgnoreCase(mailFrom.asText());
        }
        return false;
    }