diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py
index 5e169f3609..44737e42b5 100644
--- a/corporate/lib/stripe.py
+++ b/corporate/lib/stripe.py
@@ -2245,8 +2245,7 @@ class BillingSession(ABC):
         context = {
             "requested_by": user_info["name"],
             "user_role": user_info["role"],
-            # TODO: realm_string_id needs to be replaced by something more generic.
-            "string_id": request_context["realm_string_id"],
+            "billing_entity": self.billing_entity_display_name,
             "support_url": support_url,
             "organization_type": org_type_display_name,
             "website": sponsorship_request.org_website,
diff --git a/templates/zerver/emails/sponsorship_request.subject.txt b/templates/zerver/emails/sponsorship_request.subject.txt
index 5d05766662..2f65c13fd6 100644
--- a/templates/zerver/emails/sponsorship_request.subject.txt
+++ b/templates/zerver/emails/sponsorship_request.subject.txt
@@ -1 +1 @@
-Sponsorship request ({{ organization_type }}) for {{ string_id }}
+Sponsorship request ({{ organization_type }}) for {{ billing_entity }}