diff --git a/client/graphql.go b/client/graphql.go
index 7b034ad54dd5541255739b254e11d00532322077..0f0de576717e4f0c415c034c02cd017a16430dd5 100644
--- a/client/graphql.go
+++ b/client/graphql.go
@@ -44,9 +44,9 @@ 		return err
 	}
 	req.Header.Add("Content-Type", "application/json")
 	auth := InternalAuth{
-		Name: username,
-		// TODO: Populate these better
-		ClientID: "core-go",
+		Name:     username,
+		ClientID: config.ServiceName(ctx),
+		// TODO: Populate this:
 		NodeID:   "core-go",
 	}
 	authBlob, err := json.Marshal(&auth)