diff --git a/etc/templates/compute.glue21 b/etc/templates/compute.glue21
index 72854cdfa..ecd63feb5 100644
--- a/etc/templates/compute.glue21
+++ b/etc/templates/compute.glue21
@@ -157,7 +157,7 @@ GLUE2EntityCreationTime: ${timestamp}
 GLUE2EntityValidity: ${validity}
 GLUE2EndpointID: ${endpoint_id}
 GLUE2EntityName: Cloud Computing Endpoint ${endpoint_name}
-GLUE2EntityOtherInfo: Authn=${endpoint['compute_api_authn_method']}
+## GLUE2EntityOtherInfo
 GLUE2EndpointURL: ${endpoint['compute_endpoint_url']}
 % for capability in endpoint['compute_capabilities']:
 GLUE2EndpointCapability: ${capability}
@@ -177,7 +177,7 @@ GLUE2EndpointHealthState: ok
 GLUE2EndpointHealthStateInfo: Endpoint functioning properly
 GLUE2EndpointServingState: ${endpoint['compute_production_level']}
 ## GLUE2EndpointStartTime:
-## GLUE2EndpointAuthentication:
+GLUE2EndpointAuthentication: ${endpoint['compute_api_authn_method']}
 GLUE2EndpointIssuerCA: ${endpoint['endpoint_issuer']}
 % for trusted_ca in endpoint['endpoint_trusted_cas']:
 GLUE2EndpointTrustedCA: ${trusted_ca}