diff --git a/backend/handlers/main.go b/backend/handlers/main.go
index 5e765c9..4bfe5f8 100644
--- a/backend/handlers/main.go
+++ b/backend/handlers/main.go
@@ -333,7 +333,7 @@ func WebhookReceiveHandler(db *gorm.DB) http.HandlerFunc {
 		messages := value["messages"].([]interface{})
 		if len(messages) > 0 {
 			msg := messages[0].(map[string]interface{})
-			//from := msg["from"].(string)
+			from := msg["from"].(string)
 			msgType := msg["type"].(string)
 			msgID := msg["id"].(string)
 
@@ -354,7 +354,7 @@ func WebhookReceiveHandler(db *gorm.DB) http.HandlerFunc {
 
 			conv := models.Conversation{
 				UserID:    user.ID,
-				From:      user.NameClient,
+				From:      from,
 				To:        recipientID,
 				MessageID: msgID,
 				Type:      msgType,
@@ -374,7 +374,6 @@ func WebhookReceiveHandler(db *gorm.DB) http.HandlerFunc {
 }
 
 
-
 func CreateUser(db *gorm.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var user models.User
@@ -522,7 +521,7 @@ func HandleTemplateTest(db *gorm.DB) http.HandlerFunc {
 		description := fmt.Sprintf("Template: %s, Lang: %s, Params: %v", templateName, lang, params)
 		db.Create(&models.Conversation{
 			UserID:    user.ID,
-			From:      "bot",
+			From:      user.NameClient,
 			To:        to,
 			MessageID: messageID,
 			Type:      "template",