diff --git a/internal/tg/draft.go b/internal/tg/draft.go
index 3ff566c..e934597 100644
--- a/internal/tg/draft.go
+++ b/internal/tg/draft.go
@@ -35,12 +35,12 @@ func (c *Client) SendDraft(args DraftArguments) (*mcp.ToolResponse, error) {
 			Message: args.Text,
 		})
 		if err != nil {
-			return fmt.Errorf("failed to send draft: %w", err)
+			return fmt.Errorf("failed to get history: %w", err)
 		}
 
 		return nil
 	}); err != nil {
-		return nil, errors.Wrap(err, "failed to send draft")
+		return nil, errors.Wrap(err, "failed to get history")
 	}
 
 	jsonData, err := json.Marshal(DraftResponse{Success: ok})
diff --git a/internal/tg/helpers.go b/internal/tg/helpers.go
index 0a158fc..8fe2258 100644
--- a/internal/tg/helpers.go
+++ b/internal/tg/helpers.go
@@ -30,7 +30,7 @@ func getUsername(source any) string {
 	var username string
 	switch u := source.(type) {
 	case *tg.User:
-		username = fmt.Sprintf("user[%d]", u.ID)
+		username = u.Username
 	case *tg.Chat:
 		username = fmt.Sprintf("cht[%d]", u.ID)
 	case *tg.Channel:
diff --git a/internal/tg/history.go b/internal/tg/history.go
index c43bb44..1a2319c 100644
--- a/internal/tg/history.go
+++ b/internal/tg/history.go
@@ -89,14 +89,6 @@ func getInputPeerFromName(ctx context.Context, api *tg.Client, name string) (tg.
 		}
 
 		return &chatPeer, nil
-	case strings.HasPrefix(name, "user") && isCustom:
-		var userPeer tg.InputPeerUser
-		_, err := fmt.Sscanf(name, "user[%d]", &userPeer.UserID)
-		if err != nil {
-			return nil, errors.Wrapf(err, "scan user peer(%q)", name)
-		}
-
-		return &userPeer, nil
 	default:
 		sender := message.NewSender(api)
 		inputPeer, err := sender.Resolve(name).AsInputPeer(ctx)