diff --git a/common/email.go b/common/email.go
index 7728cbbe..7d6963cc 100644
--- a/common/email.go
+++ b/common/email.go
@@ -14,10 +14,13 @@ func SendEmail(subject string, receiver string, content string) error {
 		SMTPFrom = SMTPAccount
 	}
 	encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject)))
-	
-	// Extract domain from SMTPFrom
-	domain := strings.Split(SMTPFrom, "@")[1]
 
+	// Extract domain from SMTPFrom
+	parts := strings.Split(SMTPFrom, "@")
+	var domain string
+	if len(parts) > 1 {
+		domain = parts[1]
+	}
 	// Generate a unique Message-ID
 	buf := make([]byte, 16)
 	_, err := rand.Read(buf)
@@ -29,7 +32,7 @@ func SendEmail(subject string, receiver string, content string) error {
 	mail := []byte(fmt.Sprintf("To: %s\r\n"+
 		"From: %s<%s>\r\n"+
 		"Subject: %s\r\n"+
-		"Message-ID: %s\r\n"+ // Add Message-ID to avoid being treated as spam, RFC 5322
+		"Message-ID: %s\r\n"+ // add Message-ID header to avoid being treated as spam, RFC 5322
 		"Content-Type: text/html; charset=UTF-8\r\n\r\n%s\r\n",
 		receiver, SystemName, SMTPFrom, encodedSubject, messageId, content))