diff --git a/templates/corporate/zulipchat_migration_tos.html b/templates/corporate/zulipchat_migration_tos.html
index fbadd62cc2..bc966f3135 100644
--- a/templates/corporate/zulipchat_migration_tos.html
+++ b/templates/corporate/zulipchat_migration_tos.html
@@ -1,6 +1,7 @@
-<div class="pitch">
-    {% trans %}
-    <p>This organization has been migrated to new hosting on zulip.com. We just need you to do one last thing.</p>
-    <h3>Accept the Zulip Cloud terms of service</h3>
-    {% endtrans %}
+<div class="description">
+    <p>
+        {% trans %}
+        This team chat is now being hosted on Zulip Cloud. Please accept the <a href="https://zulip.com/policies/terms">Zulip Terms of Service</a> to continue.
+        {% endtrans %}
+    </p>
 </div>
diff --git a/templates/zerver/accounts_accept_terms.html b/templates/zerver/accounts_accept_terms.html
index ec6b5a035d..deb9bf5836 100644
--- a/templates/zerver/accounts_accept_terms.html
+++ b/templates/zerver/accounts_accept_terms.html
@@ -9,13 +9,9 @@ the registration flow has its own (nearly identical) copy of the fields below in
 
 <div class="account-accept-terms-page flex full-page">
     <div class="center-block new-style">
-        {% if special_message_template %}
-        {% include special_message_template %}
-        {% else %}
         <div class="pitch">
             <h1 class="get-started">{{ _("Accept the Terms of Service") }}</h1>
         </div>
-        {% endif %}
 
         <div class="form-horizontal white-box">
             <form method="post" class="form-horizontal" id="registration" action="{{ url('accept_terms') }}">
@@ -27,7 +23,9 @@ the registration flow has its own (nearly identical) copy of the fields below in
                     </div>
                 </div>
 
-                {% if terms_of_service_message %}
+                {% if first_time_terms_of_service_message_template %}
+                {% include first_time_terms_of_service_message_template %}
+                {% elif terms_of_service_message %}
                 <div class="description">
                     <p>{{ terms_of_service_message |safe }}</p>
                 </div>
diff --git a/zerver/views/home.py b/zerver/views/home.py
index 9b9d7217fb..58a13afed8 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -45,19 +45,19 @@ def accounts_accept_terms(request: HttpRequest) -> HttpResponse:
         form = ToSForm()
 
     email = request.user.delivery_email
-    special_message_template = None
+    first_time_terms_of_service_message_template = None
     if (
         request.user.tos_version is None
         and settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE is not None
     ):
-        special_message_template = settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE
+        first_time_terms_of_service_message_template = settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE
     return render(
         request,
         "zerver/accounts_accept_terms.html",
         context={
             "form": form,
             "email": email,
-            "special_message_template": special_message_template,
+            "first_time_terms_of_service_message_template": first_time_terms_of_service_message_template,
         },
     )