diff --git a/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java b/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
index ee97e52f..f264e642 100755
--- a/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
+++ b/jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
@@ -143,7 +143,11 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
                 MimeMessage mimeMessage = this.javaMailSender.createMimeMessage();
                 MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "utf-8");
 
-                helper.setFrom(this.sender);
+                if (StringUtils.isNotBlank(this.username)) {
+                    helper.setFrom(this.sender + '<' + this.username + '>');
+                } else {
+                    helper.setFrom(this.sender);
+                }
                 helper.setTo(template.getSendTo().toArray(new String[0]));
                 helper.setSubject(template.getSubject());
                 helper.setText(new String(template.getText().getBytes(), StandardCharsets.UTF_8), true);
diff --git a/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmOrgProvider.java b/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmOrgProvider.java
deleted file mode 100644
index 56088322..00000000
--- a/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmOrgProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.jetlinks.community.notify.manager.subscriber.providers;
-
-import lombok.extern.slf4j.Slf4j;
-import org.hswebframework.web.authorization.Authentication;
-import org.jetlinks.core.event.EventBus;
-import org.jetlinks.core.metadata.PropertyMetadata;
-import org.jetlinks.core.metadata.SimplePropertyMetadata;
-import org.jetlinks.core.metadata.types.StringType;
-import org.jetlinks.community.notify.manager.subscriber.Subscriber;
-import org.jetlinks.community.topic.Topics;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-
-@Component
-@Slf4j
-public class AlarmOrgProvider extends AlarmProvider {
-
-    public AlarmOrgProvider(EventBus eventBus) {
-        super(eventBus);
-    }
-
-    @Override
-    public String getId() {
-        return "alarm-org";
-    }
-
-    @Override
-    public String getName() {
-        return "部门告警";
-    }
-
-    @Override
-    public Mono<Subscriber> createSubscriber(String id, Authentication authentication, Map<String, Object> config) {
-        String topic = Topics.alarm(TargetType.org.name(), "*", getAlarmId(config));
-        return doCreateSubscriber(id, authentication, topic);
-    }
-
-    @Override
-    public Flux<PropertyMetadata> getDetailProperties(Map<String, Object> config) {
-        return super.getDetailProperties(config)
-            .concatWith(Flux.just(
-                SimplePropertyMetadata.of("targetId", "组织ID", StringType.GLOBAL),
-                SimplePropertyMetadata.of("targetName", "组织名称", StringType.GLOBAL)
-            ));
-    }
-
-}
diff --git a/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmProvider.java b/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmProvider.java
index 5f144619..6f432a7d 100755
--- a/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmProvider.java
+++ b/jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmProvider.java
@@ -132,7 +132,6 @@ public class AlarmProvider implements SubscriberProvider {
     enum TargetType {
         device("设备"),
         product("产品"),
-        org("组织"),
         other("其它");
 
         private final String text;