diff --git a/pkg/github/context_tools.go b/pkg/github/context_tools.go
index 43a5ce72..cf859f8b 100644
--- a/pkg/github/context_tools.go
+++ b/pkg/github/context_tools.go
@@ -40,14 +40,10 @@ func GetMe(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Too
 
 		// Create minimal user representation instead of returning full user object
 		minimalUser := MinimalUser{
-			Login: user.GetLogin(),
-			ID:    user.GetID(),
-		}
-		if user.HTMLURL != nil {
-			minimalUser.ProfileURL = *user.HTMLURL
-		}
-		if user.AvatarURL != nil {
-			minimalUser.AvatarURL = *user.AvatarURL
+			Login:      user.GetLogin(),
+			ID:         user.GetID(),
+			ProfileURL: user.GetHTMLURL(),
+			AvatarURL:  user.GetAvatarURL(),
 		}
 
 		return MarshalledTextResult(minimalUser), nil
diff --git a/pkg/github/search.go b/pkg/github/search.go
index 5106b84d..82f92035 100644
--- a/pkg/github/search.go
+++ b/pkg/github/search.go
@@ -224,15 +224,11 @@ func userOrOrgHandler(accountType string, getClient GetClientFn) server.ToolHand
 
 		for _, user := range result.Users {
 			if user.Login != nil {
-				mu := MinimalUser{Login: *user.Login}
-				if user.ID != nil {
-					mu.ID = *user.ID
-				}
-				if user.HTMLURL != nil {
-					mu.ProfileURL = *user.HTMLURL
-				}
-				if user.AvatarURL != nil {
-					mu.AvatarURL = *user.AvatarURL
+				mu := MinimalUser{
+					Login:      user.GetLogin(),
+					ID:         user.GetID(),
+					ProfileURL: user.GetHTMLURL(),
+					AvatarURL:  user.GetAvatarURL(),
 				}
 				minimalUsers = append(minimalUsers, mu)
 			}