diff --git a/corporate/tests/test_remote_billing.py b/corporate/tests/test_remote_billing.py
index c4e10144ec..ee64494970 100644
--- a/corporate/tests/test_remote_billing.py
+++ b/corporate/tests/test_remote_billing.py
@@ -512,9 +512,9 @@ class LegacyServerLoginTest(BouncerTestCase):
         confirmation_url = self.get_confirmation_url_from_outbox(
             email,
             url_pattern=(
-                f"{settings.SELF_HOSTING_MANAGEMENT_SUBDOMAIN}.{settings.EXTERNAL_HOST}" + r"(\S+)>"
+                f"{settings.SELF_HOSTING_MANAGEMENT_SUBDOMAIN}.{settings.EXTERNAL_HOST}" + r"(\S+)"
             ),
-            email_body_contains="Click the link below to complete the login process",
+            email_body_contains="This link will expire in 2 hours",
         )
         if return_without_clicking_confirmation_link:
             return result
diff --git a/corporate/views/remote_billing_page.py b/corporate/views/remote_billing_page.py
index ef2be417a4..7a214ca82a 100644
--- a/corporate/views/remote_billing_page.py
+++ b/corporate/views/remote_billing_page.py
@@ -528,8 +528,9 @@ def remote_billing_legacy_server_confirm_login(
 
     context = {
         "remote_server_hostname": remote_server.hostname,
-        "remote_server_uuid": str(remote_server.uuid),
         "confirmation_url": url,
+        "billing_help_link": "https://zulip.com/help/self-hosted-billing",
+        "billing_contact_email": "sales@zulip.com",
     }
     send_email(
         "zerver/emails/remote_billing_legacy_server_confirm_login",
diff --git a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.html b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.html
index a09db5286c..003728a4b5 100644
--- a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.html
+++ b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.html
@@ -6,17 +6,15 @@
 
 {% block content %}
 <p>
-    {{ _("You have initiated login to the Zulip server billing management system for the following server:") }}
-    <ul>
-        <li>{% trans %}Hostname: {{ remote_server_hostname }}{% endtrans %}</li>
-        <li>{% trans %}zulip_org_id: {{ remote_server_uuid }}{% endtrans %}</li>
-    </ul>
+    {% trans %}Either you, or someone on your behalf, has requested a log in link to manage the Zulip plan for <b>{{ remote_server_hostname }}</b>.{% endtrans %}
 </p>
 <p>
-    {{ _("Click the button below to complete the login process.") }}
-    <a class="button" href="{{ confirmation_url }}">{{ _("Confirm login") }}</a>
+    {{ _("Click the button below to log in. This link will expire in 2 hours.") }}
 </p>
 <p>
-    {{macros.contact_us_zulip_cloud(support_email)}}
+    <a class="button" href="{{ confirmation_url }}">{{ _("Log in") }}</a>
+</p>
+<p>
+    {% trans billing_contact_email=macros.email_tag(billing_contact_email) %}Questions? <a href="{{ billing_help_link }}">Learn more</a> or contact {{ billing_contact_email }}.{% endtrans %}
 </p>
 {% endblock %}
diff --git a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.subject.txt b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.subject.txt
index dcc9be11dc..b808605b6d 100644
--- a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.subject.txt
+++ b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.subject.txt
@@ -1 +1 @@
-{% trans %}Confirm login to Zulip server billing management{% endtrans %}
+{% trans %}Log in to Zulip plan management{% endtrans %}
diff --git a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.txt b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.txt
index 52e8c450d3..f5ec54546f 100644
--- a/templates/zerver/emails/remote_billing_legacy_server_confirm_login.txt
+++ b/templates/zerver/emails/remote_billing_legacy_server_confirm_login.txt
@@ -1,9 +1,8 @@
-{{ _("You have initiated login to the Zulip server billing management system for the following server:") }}
-* {% trans %}Hostname: {{ remote_server_hostname }}{% endtrans %}
+{% trans %}Either you, or someone on your behalf, has requested a log in link to manage the Zulip plan for {{ remote_server_hostname }}.{% endtrans %}
 
-* {% trans %}zulip_org_id: {{ remote_server_uuid }}{% endtrans %}
 
-{{ _("Click the link below to complete the login process;") }}
-    <{{ confirmation_url }}>
+{{ _("Click the link below to log in. This link will expire in 2 hours.") }}
 
-{% trans %}Do you have questions or feedback to share? Contact us at {{ support_email }} — we'd love to help!{% endtrans %}
+{{ _("Log in") }}: {{ confirmation_url }}
+
+{% trans %}Questions? Learn more at {{ billing_help_link }} or contact {{ billing_contact_email }}.{% endtrans %}