diff --git a/_articles/faqs/twostep-faqs.md b/_articles/faqs/twostep-faqs.md
index 531b2009..3d51f5b6 100644
--- a/_articles/faqs/twostep-faqs.md
+++ b/_articles/faqs/twostep-faqs.md
@@ -22,6 +22,12 @@ This article contains Frequently Asked Questions (FAQs) regarding **Two-step Log
#### Q: Why is Bitwarden not asking for my enabled Two-step Login method?
-**A:** If any [method]({% link _articles/two-step-login/setup-two-step-login.md %}) is enabled, Two-step Login is required to **Log In** to your Vault. Two-step Login **is not required to Unlock** your Vault. If Bitwarden isn't asking for your Two-step Login method, you're likely already logged in and only unlocking your Vault.
+**A:** In most cases, one of two things is happening:
-For more information on the difference between Logging In and Unlocking, see [Vault Timeout Action](https://bitwarden.com/help/article/vault-timeout/#vault-timeout-action).
+1. You may be already logged in to Bitwarden and only unlocking your Vault. Two-step Login is required to **Log In** but not to **Unlock** your Vault. For more information on the difference between Logging In and Unlocking, see [Vault Timeout Action](https://bitwarden.com/help/article/vault-timeout/#vault-timeout-action).
+
+2. You may have previously checked the **Remember me** checkbox on a device when accessing your Vault using Two-step Login.
+
+ {% image /two-step/twostep-remember.png Remember me option %}
+
+ If you used the **Remember me** option, you will need to **Deauthorize Sessions** from your Web Vault (**Settings** → **My Account**) for that device to continue asking for your Two-step Login method.
diff --git a/_articles/hosting/environment-variables.md b/_articles/hosting/environment-variables.md
index 0f91ef5e..33b29cd4 100644
--- a/_articles/hosting/environment-variables.md
+++ b/_articles/hosting/environment-variables.md
@@ -32,7 +32,7 @@ The following variables are among those that already exist in `global.override.e
|globalSettings__mail__smtp__ssl=| (Boolean) Whether your SMTP Server uses an encryption protocol:
`true` = SSL
`false` = TLS|
|globalSettings__mail__smtp__username=|A valid username for the `smtp__host`.|
|globalSettings__mail__smtp__password=|A valid password for the `smtp__host`.|
-|globalSettings__disableUserRegistration=|Specify `true` to disable new users from being added to the instance.|
+|globalSettings__disableUserRegistration=|Specify `true` to disable new users signing up for an account on this instance via the Registration page.|
|globalSettings__hibpApiKey=|Your HaveIBeenPwned (HIBP) API Key, available [here](https://haveibeenpwned.com/API/Key).|
|adminSettings__admins=|Email addresses which may access the [System Administrator Portal]({% link _articles/hosting/admin-portal.md%}).|
diff --git a/_articles/hosting/migration.md b/_articles/hosting/migration.md
index 3a6fe1f9..08fe88e9 100644
--- a/_articles/hosting/migration.md
+++ b/_articles/hosting/migration.md
@@ -17,7 +17,7 @@ When migrating from the Cloud to an on-premises instance:
1. [Install and Deploy]({% link _articles/hosting/install-on-premise.md %}) Bitwarden to your on-premises server.
2. [Download your Enterprise Organization License](https://bitwarden.com/help/article/licensing-on-premise/#organization-license) from the Cloud Web Vault and use it to [Create an Organization]({% link _articles/organizations/create-an-organization.md %}) in your on-premises instance.
3. [Export your Data]({% link _articles/account/export-your-data.md %}) from the Cloud Web Vault.
-4. [Import your Data]({}) to your on-premisesinstance to automatically create Collections, Vault items, and their associations.
+4. [Import your Data]({% link _articles/importing/import-data.md %}) to your on-premises instance to automatically create Collections, Vault items, and their associations.
5. [Create User Groups]({% link _articles/organizations/create-groups.md %}) manually in your on-premises instance.
6. Start [Inviting Users to your Organization]({% link _articles/organizations/managing-users.md %}).
diff --git a/_articles/organizations/policies.md b/_articles/organizations/policies.md
index 1ae24575..85244ae1 100644
--- a/_articles/organizations/policies.md
+++ b/_articles/organizations/policies.md
@@ -99,7 +99,7 @@ As a result, you must disable the **Single Sign-On Authentication** policy befor
Enabling the **Personal Ownership** policy will require non-Owner/non-Admin users to save Vault Items to an Organization by disabling personal ownership of Vault items for organization users.
-A banner is displayed to users on the Add Item screen indicating that a policy will affect their membership options.
+A banner is displayed to users on the Add Item screen indicating that a policy will affect their ownership options.
{% callout info %}
Vault Items that were created prior to the implementation of this policy or prior to joining the Organization will remain in the user's personal Vault.
diff --git a/_articles/security/is-bitwarden-audited.md b/_articles/security/is-bitwarden-audited.md
index 1cd3a708..9e48e27f 100644
--- a/_articles/security/is-bitwarden-audited.md
+++ b/_articles/security/is-bitwarden-audited.md
@@ -28,7 +28,7 @@ Bitwarden complies with EU-U.S. Privacy Shield Frameworks. In addition, Bitwarde
### HIPAA
-Bitwarden is HIPPA compliant.
+Bitwarden is HIPAA compliant.
## Third Party Security Audits
diff --git a/_articles/two-step-login/setup-two-step-login-u2f.md b/_articles/two-step-login/setup-two-step-login-u2f.md
index 975fd790..386cfbff 100644
--- a/_articles/two-step-login/setup-two-step-login-u2f.md
+++ b/_articles/two-step-login/setup-two-step-login-u2f.md
@@ -10,7 +10,7 @@ order: 07
Two-step Login using [FIDO U2F](https://www.yubico.com/solutions/fido-u2f/){:target="_blank"} is available for Premium users, including members of Paid Organizations (Families, Teams, or Enterprise).
-Any FIDO U2F certified device can be used, however we recommend a [YubiKey](https://www.yubico.com/products/yubikey-hardware/){:target="_blank"}.
+Any FIDO U2F certified device can be used, including YubiKeys, SoloKeys, Google Titan, Nitrokeys, and more.
{% callout info %}
**FIDO U2F cannot be used on all Bitwarden applications.** Enable another Two-step Login method in order to access your vault on unsupported applications.
diff --git a/images/two-step/twostep-remember.png b/images/two-step/twostep-remember.png
new file mode 100644
index 00000000..a3cf9752
Binary files /dev/null and b/images/two-step/twostep-remember.png differ