diff --git a/_articles/account/forgot-master-password.md b/_articles/account/forgot-master-password.md
index 70f70e7c..5fb32525 100644
--- a/_articles/account/forgot-master-password.md
+++ b/_articles/account/forgot-master-password.md
@@ -10,7 +10,7 @@ order: 02
As described in the [Your Master Password]({% link _articles/account/master-password.md %}) article, Bitwarden has no knowledge of, way to retrieve, or way to reset your Master Password.
-If you've already lost your Master Password, there is unfortunately no way for the team to recover the account or the data therein. You will need to delete your account and start a new one.
+If you've already lost your Master Password, there is unfortunately no way for the team to recover the account or the data stored in your Personal Vault. You will need to delete your account and start a new one.
{% callout success %}
Before deleting your account:
diff --git a/_articles/faqs/product-faqs.md b/_articles/faqs/product-faqs.md
index 5a25b6e2..3081df0d 100644
--- a/_articles/faqs/product-faqs.md
+++ b/_articles/faqs/product-faqs.md
@@ -23,6 +23,14 @@ This article contains Frequently Asked Questions (FAQs) about general Vault Mana
**A:** There is! Users with a Premium subscription can proactively setup trusted emergency contacts who can access your Vault in case of emergency. For more information, see [Emergency Access]({% link _articles/security/emergency-access.md %}).
+### Q: How do I change my Master Password hint?
+
+**A:** To change your Master Password hint:
+
+1. Open the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}, select **Settings** from the top navigation bar.
+2. On the **My Account** page, find the **Master Password Hint** input box.
+3. Enter a hint and select the **Save** button.
+
### Q: How do I change my email address?
**A:** To change the email address attached to your account:
diff --git a/_articles/features/uri-match-detection.md b/_articles/features/uri-match-detection.md
index 6673bb4f..4d1fdcdf 100644
--- a/_articles/features/uri-match-detection.md
+++ b/_articles/features/uri-match-detection.md
@@ -84,7 +84,7 @@ For example, if the URI value `https://sub.domain.com/path/` uses starts with ma
|https://sub.domain.com/path/ ||
|https://sub.domain.com/path/page.html ||
|https://sub.domain.com ||
-|https://sub.domain.com:4000/path/page.html (interrupted with a port ||
+|https://sub.domain.com:4000/path/page.html (interrupted with a port) ||
|https://sub.domain.com/path (absent trailing slash) ||
### Regular expression
diff --git a/_articles/hosting/install-on-premise.md b/_articles/hosting/install-on-premise.md
index 27210a4b..a76168c3 100644
--- a/_articles/hosting/install-on-premise.md
+++ b/_articles/hosting/install-on-premise.md
@@ -46,6 +46,10 @@ The following is a summary of the Installation Procedure in this article. Links
By default, Bitwarden will be served through ports 80 (`http`) and 443 (`https`) on the host machine. Open these ports so that Bitwarden can be accessed from within and/or outside of the network. You may opt to choose different ports during installation.
+{% callout success %}
+**If you're using Windows Firewall**, Docker Desktop for Windows will not automatically add an exception for itself in Windows Firewall. Add exceptions for TCP ports 80 and 443 (or chosen alternative ports) to prevent some errors.
+{% endcallout %}
+
Bitwarden recommends configuring a domain name with DNS records that point to your host machine (for example, `bitwarden.example.com`), especially if you are serving Bitwarden over the internet.
### Install Docker and Docker Compose
diff --git a/_articles/hosting/updating-on-premise.md b/_articles/hosting/updating-on-premise.md
index dcb66987..6497dc86 100644
--- a/_articles/hosting/updating-on-premise.md
+++ b/_articles/hosting/updating-on-premise.md
@@ -8,7 +8,11 @@ tags: [hosting, update]
order: 06
---
-**It is critically important to keep your Self-hosted Bitwarden instance up to date.** Updates may include fixes that are important for the security of your Bitwarden instance, including patches to any vulnerabilities. Data stored in your Bitwarden Vault, including passwords, should be considered critical data and therefore protected with up-to-date software.
+{% callout success %}
+Please be aware that self-hosted server releases lag several days behind Cloud server releases.
+{% endcallout %}
+
+**It is critically important to keep your Self-hosted Bitwarden instance up to date.** Updates may include fixes that are important for the security of your Bitwarden instance, including patches to any vulnerabilities. Data stored in your Bitwarden Vault, including passwords, should be considered critical data and therefore protected with up-to-date software.
Additionally, newer versions of client applications may not support older versions of your self-hosted instance.
diff --git a/_articles/organizations/about-collections.md b/_articles/organizations/about-collections.md
index fd1e5cc7..21caddfd 100644
--- a/_articles/organizations/about-collections.md
+++ b/_articles/organizations/about-collections.md
@@ -53,7 +53,7 @@ Nested Collections are **for display-purposes only**. They will not inherit item
To create a nested Collection, follow the [steps above](#create-a-collection), but give your Collections a **Name** that includes the "parent" name followed by a forward slash (`/`) delimiter, for example `Collection 1/Collection 1a`. If the "parent" Collection doesn't exist, the title will be displayed in-full.
-## Edit or Delete a Collection
+## Manage a Collection
You may find that you need to add or remove users from a Collection, or delete it entirely. Both of these can be done from the **Manage** → **Collections** view by hovering over the desired Collection and selecting the {% icon fa-cog %} gear dropdown:
diff --git a/_articles/organizations/admin-reset.md b/_articles/organizations/admin-reset.md
index 7da1a89d..5e4466d4 100644
--- a/_articles/organizations/admin-reset.md
+++ b/_articles/organizations/admin-reset.md
@@ -73,7 +73,7 @@ If you're automatically enrolling Organization members in Admin Password Reset,
To enroll in Password Reset, navigate to **Settings** → **Organizations** in the [Web Vault](https://vault.bitwarden.com/){:target="\_blank"}:
-{% image organizations/pwreset-enroll.png Enroll in Password Reset %}
+{% image organizations/pwreset-enroll-gif.gif Enroll in Password Reset %}
Hover over the Organization you wish to enroll in Password Reset for, select the {% icon fa-cog %} gear dropdown, and choose **Enroll in Password Reset**. When you're enrolled in Password Reset, the Organization listing will display a {% icon fa-key %} key icon. You can enroll in Admin Password Reset for multiple Organizations, if you choose.
diff --git a/_articles/organizations/policies.md b/_articles/organizations/policies.md
index d793042a..3f61db07 100644
--- a/_articles/organizations/policies.md
+++ b/_articles/organizations/policies.md
@@ -92,7 +92,7 @@ Enabling the **Single Sign-On Authentication** policy will require non-Owner/non
{% callout info %}
The **Single Organization** policy must be enabled before activating this policy.
-As a result, you must disable the **Single Sign-On Authentication** policy before you can disable the **Single Ownership** policy.
+As a result, you must disable the **Single Sign-On Authentication** policy before you can disable the **Single Organization** policy.
{% endcallout %}
### Personal Ownership
diff --git a/_articles/two-step-login/lost-two-step-device.md b/_articles/two-step-login/lost-two-step-device.md
index 8719dcd4..51418db4 100644
--- a/_articles/two-step-login/lost-two-step-device.md
+++ b/_articles/two-step-login/lost-two-step-device.md
@@ -31,7 +31,10 @@ If you're locked out of your Vault by a **Duo (Organization)** prompt, reach out
If you don't have your Recovery Code saved somewhere outside of your Vault, there is unfortunately no way for the team to recover the account or data therein. You'll need to delete your account and start a new one.
{% callout success %}
-Before proceeding to delete your account, **check if you're currently logged in to any Bitwarden client applications** (Mobile Apps, Browser Extensions, etc.). If you are, [export your vault data]({% link _articles/account/export-your-data.md %}) to preserve your data.
+Before proceeding to delete your account, try the following:
+
+1. **If you're using Duo**, [generate a bypass code](https://duo.com/docs/administration-users#generating-a-bypass-code). For Duo for Organizations, your company's Duo administrator can generate a bypass code for you.
+2. **Check if you're currently logged in to any Bitwarden client applications** (Mobile Apps, Browser Extensions, etc.). If you are, [export your vault data]({% link _articles/account/export-your-data.md %}) to preserve your data.
{% endcallout %}
To delete your account:
diff --git a/_articles/two-step-login/setup-two-step-login-fido.md b/_articles/two-step-login/setup-two-step-login-fido.md
index 65cc575c..7fb22c7e 100644
--- a/_articles/two-step-login/setup-two-step-login-fido.md
+++ b/_articles/two-step-login/setup-two-step-login-fido.md
@@ -20,7 +20,7 @@ Existing FIDO U2F security keys will still be usable and will be marked **(Migra
FIDO2 WebAuthn cannot be used on all Bitwarden applications. Enable another Two-step Login method in order to access your vault on unsupported applications. Supported applications include:
-- **Web Vault** on a computer with a [FIDO2-supported Browser](https://fidoalliance.org/fido2/fido2-web-authentication-webauthn/){:target="\_blank"}.
+- **Web Vault** on a device with a [FIDO2-supported Browser](https://fidoalliance.org/fido2/fido2-web-authentication-webauthn/){:target="\_blank"}.
- **Browser Extensions** for a [FIDO2-supported Browser](https://fidoalliance.org/fido2/fido2-web-authentication-webauthn/){:target="\_blank"}.
- **Desktop Application** on Windows 10 and above.
@@ -44,7 +44,7 @@ Complete the following steps to enable Two-step Login using FIDO2 WebAuthn:
You will be prompted to enter your Master Password to continue.
5. Give your security key a friendly **Name**.
-6. Plug the security key into your computer's USB port and select **Read Key**.
+6. Plug the security key into your device's USB port and select **Read Key**.
If your security key has a button, touch it.
@@ -63,7 +63,7 @@ The following assumes that **FIDO2 WebAuthn** is your [highest-priority enabled
1. Log in to your Bitwarden Vault (*Web Vault* or *Browser Extension*) and enter your Email Address and Master Password.
- You will be prompted to insert your security key into your computer's USB port. If it has a button, touch it.
+ You will be prompted to insert your security key into your device's USB port. If it has a button, touch it.
{% image two-step/u2f/fido2.png %}
diff --git a/images/organizations/pwreset-enroll-gif.gif b/images/organizations/pwreset-enroll-gif.gif
new file mode 100644
index 00000000..3859f90e
Binary files /dev/null and b/images/organizations/pwreset-enroll-gif.gif differ