diff --git a/templates/zerver/help/change-your-password.md b/templates/zerver/help/change-your-password.md
index 241dc60de6..62b00f313c 100644
--- a/templates/zerver/help/change-your-password.md
+++ b/templates/zerver/help/change-your-password.md
@@ -1,15 +1,15 @@
 # Change Your Password
 
-In Zulip, you can easily change your account password. While logged
-into Zulip, click the gear in the upper-right corner of the screen and
-navigate to the `Settings` page. In the `Your Account` section, under
-your name, there will be a button that says `Change Password`. Click
-it.
+## If you know your current password
 
-![Manage Your Password](/static/images/help/manage_your_password.png)
-![Change Password Page](/static/images/help/change_password_page.png)
+1. Go to the [Your Account](/#settings/your-account) tab of the
+   [Settings](/help/edit-settings) page.
+2. Click the **Change Password** button located underneath your name.
+3. You will be asked first to enter your old password, and then to
+   enter a new password and to confirm it.
+4. Click **Save Changes** to apply your new password.
 
-From here, you will be asked first to enter your old password, and
-then to enter a new password and to confirm it. Your new password must
-be longer than six characters. Click `Save Changes` to apply your new
-password.
+!!! tip ""
+    Your password must be six characters or longer.
+
+## If you forgot your password