From ad5f7a912ea3d2f9414cdc3f066e383ca84b63be Mon Sep 17 00:00:00 2001 From: Lyla Fischer Date: Tue, 10 Jul 2018 13:30:37 -0400 Subject: [PATCH] user docs: Update deactivate-or-reactivate-a-user. --- .../help/deactivate-or-reactivate-a-user.md | 45 +++++++------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/templates/zerver/help/deactivate-or-reactivate-a-user.md b/templates/zerver/help/deactivate-or-reactivate-a-user.md index 4f583379ae..a96f9de369 100644 --- a/templates/zerver/help/deactivate-or-reactivate-a-user.md +++ b/templates/zerver/help/deactivate-or-reactivate-a-user.md @@ -2,49 +2,34 @@ {!admin-only.md!} -Follow the following steps to deactivate or reactivate any user's account in your -organization. +## Deactivate (ban) a user -## Deactivate a user - -To properly remove a user’s access to a Zulip organization, it does -not suffice to change their password or deactivate their account in an -email system, since neither of those actions prevents authentication -with the user’s API key or any API keys of the bots the user has -created. - -Instead, you should deactivate the user’s account using the Zulip -**[organization administration interface](/help/change-your-organization-settings)**; -this will also automatically deactivate any bots the user has created. +To properly remove a user’s access to a Zulip organization, it does not +suffice to change their password or deactivate their account in an external +email system, since the user’s API key and bot API keys will still be +active. Instead, you need to deactivate the user’s account using the Zulip +organization administration interface. {settings_tab|user-list-admin} 4. Click the **Deactivate** button to the right of the user account that you want to deactivate. -4. After clicking the **Deactivate** button, a modal window titled -**Deactivate (user's email address)** will appear. +4. Click **Deactivate now** to confirm. -5. To confirm the deactivation of the user's account, click the **Deactivate now** -button. Please note that any bots that the user maintains will be -disabled. - -6. After clicking the **Deactivate now** button, the button will transform into -a **Reactivate** button, and the **Make admin** button will also -disappear, confirming the success of the account's deactivation. - - The user will be logged out immediately and returned to the Zulip login page - and will not be able to log back in. +The user will be logged out immediately and not be able to log back in. The +user's bots will also be deactivated. Lastly, the user will be unable to +create a new Zulip account in your organization using their deactivated +email address. ## Reactivate a user -Zulip organization administrators can choose to reactivate a user's deactivated account -by following the following steps. +Organization administrators can reactivate a deactivated user. They will +have the same API key and bot API keys, but the bots will be deactivated +until the user manually [reactivates](deactivate-or-reactivate-a-bot) them +again. {settings_tab|deactivated-users-admin} 4. Click the **Reactivate** button to the right of the user account that you want to reactivate. - -5. After clicking the **Reactivate** button, the button will transform into a -**Deactivate** button, confirming the success of the account's reactivation.