diff --git a/templates/zerver/help/add-or-remove-users-from-a-stream.md b/templates/zerver/help/add-or-remove-users-from-a-stream.md
index be901cdf14..79e14a9e95 100644
--- a/templates/zerver/help/add-or-remove-users-from-a-stream.md
+++ b/templates/zerver/help/add-or-remove-users-from-a-stream.md
@@ -1,61 +1,30 @@
-# Add or invite someone to a stream
+# Edit stream membership
 
-You might want to add a user to a particular stream that they haven't
-subscribed to yet so that they can send and read messages in that
-stream. In Zulip, you can add users to a public stream even if you
-aren't subscribed to that particular stream, but you must be
-subscribed to a private stream in order to invite a user to join that
-stream.
+## Add someone to a stream
 
-You can add users to streams, both public and private, that you're
-subscribed to.
+Anyone subscribed to a stream can add users to that stream. Additionally,
+anyone can add users to a public stream, whether or not they are subscribed
+to the stream.
 
-{!subscriptions.md!}
-{!filter-streams.md!}
+{!go-to-stream-via-all-streams.md!}
 
-    !!! tip ""
-    {!all-streams.md!}
+1. Under **Stream membership**, enter a name or email address. The typeahead
+   will only include users who aren't already subscribed to the stream.
 
-1. Click on the stream that you want to add someone to; {!stream-settings.md!}
-
-{!stream-settings-scroll.md!} **Stream membership** section. This section
-shows the usernames and emails of all users that are currently subscribed to the
-selected stream.
-
-1. Click on the input field labeled **Email address** and enter the username or
-email address of the user you want to add to the stream.
-
-    As you type, autocompletion suggestions will appear. You can choose to
-    select an option from the autocompletion dropdown or enter the complete
-    email address of the user.
-
-1. Once the email address is entered in the **Email address** field, click the
-**Add** button to add the user to the stream.
-
-1. After you press the **Add** button, the user will be listed in the **Stream
-membership** section, confirming that they have been successfully added to the
-stream.
+1. Click **Add**.
 
 
-# Remove someone from a stream
+## Remove someone from a stream
 
 {!admin-only.md!}
 
-Zulip allows you to remove users from streams to help manage your Zulip
-team.
+Anyone can always [unsubscribe themselves from a stream](/help/unsubscribe-from-a-stream).
 
-{!subscriptions.md!}
-{!filter-streams.md!}
+Organization administrators can also unsubscribe *other* users from any stream,
+including streams the admin is not subscribed to.
 
-    !!! tip ""
-    {!all-streams.md!}
+{!go-to-stream-via-all-streams.md!}
 
-{!stream-settings-scroll.md!} **Stream membership** section. This section
-shows all users that are subscribed to a particular stream.
+1. Under **Stream membership**, find the user you would like to remove.
 
-3. Click the **Unsubscribe** button to the right of the user you want to
-remove from the stream.
-
-4. After clicking the **Unsubscribe** button, the member will disappear from the
-**Stream membership** section, confirming the removal of the user from the
-stream.
+1. Click **Unsubscribe** to the right of their email address.