diff --git a/pkg/complianceportal/visitor/cimd.go b/pkg/complianceportal/visitor/cimd.go
index 9b4c9b49b..9bbb3cabd 100644
--- a/pkg/complianceportal/visitor/cimd.go
+++ b/pkg/complianceportal/visitor/cimd.go
@@ -85,7 +85,7 @@ func BuildClientMetadataDocument(
 
 	doc := oauth2.ClientMetadataDocument{
 		ClientID:                clientID,
-		ClientName:              "Compliance at " + portal.EntityName + ".",
+		ClientName:              portal.EntityName,
 		ClientURI:               portalRootURL,
 		RedirectURIs:            []string{redirectURI},
 		TokenEndpointAuthMethod: "none",
diff --git a/pkg/complianceportal/visitor/cimd_test.go b/pkg/complianceportal/visitor/cimd_test.go
index 021970468..9676de5f3 100644
--- a/pkg/complianceportal/visitor/cimd_test.go
+++ b/pkg/complianceportal/visitor/cimd_test.go
@@ -76,7 +76,7 @@ func TestBuildClientMetadataDocument(t *testing.T) {
 	)
 	require.NoError(t, err)
 	assert.Equal(t, "https://acme.example.com/.well-known/oauth-client-metadata", doc.ClientID)
-	assert.Equal(t, "Compliance at Acme.", doc.ClientName)
+	assert.Equal(t, "Acme", doc.ClientName)
 	assert.Equal(t, []string{"https://acme.example.com/callback"}, doc.RedirectURIs)
 	assert.Equal(t, "https://acme.example.com", doc.ClientURI)
 	assert.Equal(t, VisitorOAuthScope, doc.Scope)