From 584124bb45121264abe64920f938d88f0c9c1dfd Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Wed, 15 Mar 2023 11:20:18 -0700
Subject: [PATCH] help: Improve "Deactivate your account" help page.

---
 help/deactivate-your-account.md | 52 +++++++++++++++++++++------------
 zerver/tests/test_middleware.py |  7 +++--
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/help/deactivate-your-account.md b/help/deactivate-your-account.md
index 103aac84f2..c0ac1294ad 100644
--- a/help/deactivate-your-account.md
+++ b/help/deactivate-your-account.md
@@ -1,5 +1,31 @@
 # Deactivate your account
 
+In Zulip, you have a dedicated account for each organization you belong to.
+Deactivating your Zulip account in one organization will have no effect on any
+other Zulip accounts you may have.
+
+Once you deactivate your account, you cannot register in the same organization
+with the email address you used before. If you are re-joining an organization,
+ask an organization administrator to
+[reactivate](/help/deactivate-or-reactivate-a-user#reactivate-a-user) your
+account.
+
+!!! tip ""
+
+    You can find all the Zulip Cloud accounts associated with your email address
+    with the [**Find your accounts**](https://zulip.com/accounts/find/) tool.
+    If you have forgotten your account password, you can
+    [reset it](/help/change-your-password).
+
+
+## Deactivate your account
+
+!!! warn ""
+
+    If you are the only owner in the organization, you cannot
+    deactivate your account. You will need to
+    [add another owner](/help/change-a-users-role) first.
+
 {start_tabs}
 
 {settings_tab|account-and-privacy}
@@ -12,33 +38,21 @@
 
 ## What happens when you deactivate an account
 
-* Accounts are local to an organization; so deactivating a Zulip
-  account in the `foo.zulipchat.com` organization will have no effect
-  on any Zulip account you might have in the `bar.zulipchat.com`
-  organization.
-
-* Any bots that you maintain will be disabled.
+* Your [user card](/help/user-cards) will have a notice indicating that your
+  account has been deactivated.
 
 * Deactivating your account won't delete messages you've sent or files
   you've shared. If permitted in your organization, delete content you'd
   like to remove before deactivating your account.
 
-* You cannot register a Zulip account using the email address of a
-  deactivated account in that organization. If you change your mind
-  about deactivating an account, an organization administrator can
-  [reactivate](/help/deactivate-or-reactivate-a-user#reactivate-a-user)
-  your account at any time.
+* Any bots that you maintain will be disabled.
 
-!!! warn ""
-
-    If you are the only owner in the organization, you cannot
-    deactivate your account. You'll need to
-    [add another owner](/help/change-a-users-role) first.
 
 ## Related articles
 
-* [Logging in](logging-in)
-* [Logging out](logging-out)
-* [Switching between organizations](switching-between-organizations)
+* [Logging in](/help/logging-in)
+* [Logging out](/help/logging-out)
+* [Change your password](/help/change-your-password)
+* [Switching between organizations](/help/switching-between-organizations)
 * [Deactivate or reactivate a user](/help/deactivate-or-reactivate-a-user)
 * [Deactivate your organization](/help/deactivate-your-organization)
diff --git a/zerver/tests/test_middleware.py b/zerver/tests/test_middleware.py
index 71c8ef5147..832a11d9a8 100644
--- a/zerver/tests/test_middleware.py
+++ b/zerver/tests/test_middleware.py
@@ -111,8 +111,11 @@ class OpenGraphTest(ZulipTestCase):
         self.check_title_and_description(
             "/help/deactivate-your-account",
             "Deactivate your account | Zulip help center",
-            ["Any bots that you maintain will be disabled. | Deactivating "],
-            ["Confirm by clicking", "  ", "\n"],
+            [
+                "Deactivating your Zulip account in one organization will have no effect "
+                "on any other Zulip accounts you may have. | Once you deactivate your account"
+            ],
+            ["Approve by clicking", "  ", "\n"],
         )
 
     def test_tabs(self) -> None: