diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml
index 4b2c9ee1..6e7a5de9 100644
--- a/config/etc/default/restconf.yaml
+++ b/config/etc/default/restconf.yaml
@@ -111,10 +111,10 @@ omc:
 alarm: 
   forwardAlarm: true
   email:
-    smtp: smtp@xxx.com
+    smtp: smtp.xxx.com
     port: 25
     user: smtpuser
-    password: smtpuser@omc
+    password: *********
   sms:
     apiURL: http://smsc.xxx.com
     accessKeyID: xxx
diff --git a/features/fm/email.go b/features/fm/email.go
index 79665a2c..8a1c8f94 100644
--- a/features/fm/email.go
+++ b/features/fm/email.go
@@ -16,11 +16,15 @@ import (
 func AlarmEmailForward(alarmData *Alarm) error {
 	log.Info("AlarmEmailForward processing... ")
 
-	message := `
-    <p> Hello information,</p>
-		test, test	
-		<p style="text-indent:2em">Best Wishes!</p>
-	`
+	message := fmt.Sprintf(`
+    <p> Alarm information</p>
+		Alarm Sequence: %d
+		       NE name: %s
+		   Alarm Title: %s
+		Alarm Severity: %s
+		    Event Time: %s 	
+		<p style="text-indent:2em">The messsage is auto forward from OMC, don't reply!</p>
+	`, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime)
 
 	// QQ 邮箱：
 	// SMTP 服务器地址：smtp.qq.com（SSL协议端口：465/994 | 非SSL协议端口：25）
@@ -99,9 +103,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		return err
 	}
 
-	operResult := fmt.Sprintf("Email sent successfully!:", err)
-	log.Error(operResult)
-	forwardLog.OperResult = operResult
+	forwardLog.OperResult = "Email sent successfully!"
 	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert data:", err)
diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml
index fd6f8b19..1271a6e2 100644
--- a/restagent/etc/restconf.yaml
+++ b/restagent/etc/restconf.yaml
@@ -111,10 +111,10 @@ omc:
 alarm:
   forwardAlarm: true
   email:
-    smtp: smtp@xxx.com.cn
+    smtp: smtp.xxx.com
     port: 25
     user: smtpuser
-    password: smtpuser@omc
+    password: *********
   sms:
     apiURL: http://smsc.xxx.com.cn/
     accessKeyID: xxxx