Edits (#388)

* - Few Typos
- New 2FA FAQ Item
- Corrected recommendation in /forgot-master-password/
- Added 'Delete a Collection' section to /create-collections/
- Fix recommendation for 2FA Recovery Code
- Update plans flowchart & text
- Added 2019-2020 plans comparison tables
- Added linking to feature table in /about-bitwarden-plans/
- Added search example for org
- Added additional information about removing and org user to 
/managing-users/ and /delete-your-account/

* typo fix

_articles/account/delete-your-account.md

@@ -1,6 +1,6 @@
 ---
 layout: article
-title: Delete your Account or Organization
+title: Delete an Account or Organization
 categories: [plans-and-pricing]
 featured: false
 popular: false
@@ -8,9 +8,9 @@ tags: [account, delete]
 order: 08
 ---
 
-Deleting your Bitwarden account or Organization permanently deletes the account or Organization and **all data that is associated with it**. Bitwarden does not "soft delete" any data.
+Deleting a Bitwarden account or Organization permanently deletes the account or Organization and **all data that is associated with it**. Bitwarden does not "soft delete" any data.
 
-Deleting an account or Organization does not automatically cancel your subscription. If you're leaving Bitwarden, you should cancel your subscription from the **Settings** → **Premium Membership** or **Organization Settings** → **Subcription** page first.
+Deleting an account or Organization does not automatically cancel a subscription. If you're leaving Bitwarden, you should cancel your subscription from the **Settings** → **Premium Membership** or **Organization Settings** → **Subcription** page first.
 
 If you're locked out of your Vault and deleting your account so that you can create a new one, [Contact Us](https://bitwarden.com/contact/){:target="\_blank"} and we can help transfer your subcription to the new account.
 
@@ -18,10 +18,12 @@ If you're locked out of your Vault and deleting your account so that you can cre
 This action is permanent and cannot be undone.
 {% endcallout %}
 
-## Delete your Personal Account
+## Delete a Personal Account
 
 ### From the Web Vault
 
+Complete the following steps to delete your Bitwarden account:
+
 1. In the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}, select **Settings** from the top navigation bar.
 3. On the **My Account** page, scroll down to the **Danger Zone** and select the **Delete Account**.
 
@@ -29,15 +31,15 @@ This action is permanent and cannot be undone.
 
 ### Without Logging In
 
-In the event that you have lost your Master Password, complete the following steps to delete your account:
+Complete the following steps to delete your account without logging in (e.g. if you have lost your Master Password, or if you are deleting a Bitwarden account tied to a `@yourcompany.com` email address):
 
 1. Navigate to [vault.bitwarden.com/#/recover-delete](https://vault.bitwarden.com/#/recover-delete).
-2. Enter the **Email Address** associated with your account.
-3. In your email inbox, open the email to verify that you want to delete this Bitwarden account.
+2. Enter the **Email Address** associated with the account.
+3. In the email inbox, open the email to verify that you want to delete this Bitwarden account.
 
-Once deleted, you're free to create a new Bitwarden account with that email address. If you delete a Bitwarden account that has a Premium subscription associated with it, [Contact Us](https://bitwarden.com/contact/){:target="\_blank"} and we'll reapply your existing subscription to the new account.
+If you're deleting the account because you lost your Master Password, you can now create a new Bitwarden account with that email address. If the deleted account had a Premium subscription associated with it, [Contact Us](https://bitwarden.com/contact/){:target="\_blank"} and we'll reapply your subscription to the new account.
 
-## Delete your Organization
+## Delete an Organization
 
 {% callout info %}
 Only the **Owner** of an Organization has the authority to delete the Organization. For more information, see [User Types and Access Controls]({% link _articles/organizations/user-types-access-control.md %}).

_articles/account/forgot-master-password.md

@@ -11,7 +11,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.
 
 {% callout success %}
-If you're using any Bitwarden client applications (Mobile Apps, Browser Extensions, etc.) you should check whether any of these sessions are still logged in prior to deleting your account. If a client application is still logged in, [Export Vault Data]({% link _articles/account/export-your-data.md %}) to a file for import into a new account.
+If you're using any Bitwarden client applications (Mobile Apps, Browser Extensions, etc.) you should check whether any of these sessions are still logged in prior to deleting your account. If a client application is still logged in, you should manually catalogue your Vault items to preserve your data.
 {% endcallout %}
 
 Complete the following steps to delete your account:

_articles/faqs/product-faqs.md

@@ -155,7 +155,7 @@ You can see more about Bitwarden for iOS here: <https://bitwarden.com/help/artic
 
 ### Q: Do I need premium and families?
 
-**A:** The legacy Families plan does not include premium for its users. Users would need to upgrade to premium individually, or the family organization owner could upgrade the organizatoin.
+**A:** The legacy Families plan does not include premium for its users. Users would need to upgrade to premium individually, or the family organization owner could upgrade the organization.
 
 Currently, the Families plan introduced in September 2020, supports premium features for up to 6 users.
 

_articles/faqs/twostep-faqs.md

@@ -18,3 +18,10 @@ This article contains Frequently Asked Questions (FAQs) regarding **Two-step Log
 #### Q: Is FIDO U2F supported on my iOS or Android App?
 
 **A:** At this time, due to platform/OS limitations, FIDO U2F is **only supported for Web Vaults and Browser Extensions**, however we are currently investigating ways to implement this. In the meantime, we recommend enabling another [Two-step Login Method]({% link _articles/two-step-login/setup-two-step-login.md %}) for use with unsupported client applications.
+
+
+#### 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.
+
+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).

_articles/features/searching-vault.md

@@ -63,6 +63,7 @@ Once a field is specified, search for a value in that field using a colon (`:`)
 When constructing a full-text search, you can apply the asterisk (`*`) as a wildcard character for specified search values, for example:
 
 - `>organizationid:*` will search for all Vault items that belong to an Organization.
+- `>organizationid:-` will search for all Vault items that do not belong to an Organization.
 - `>login.username:*@gmail.com` will search for any Login item **Username** that ends in `@gmail.com`.
 
 {% callout success %}

_articles/organizations/create-collections.md

@@ -12,7 +12,7 @@ redirect_from:
 
 This article will guide you through the process of creating a Collection. For more information about Collections, see [About Collections](https://bitwarden.com/help/article/about-collections/).
 
-## Create A Collection
+## Create a Collection
 
 Complete the following steps to create a collection:
 
@@ -43,8 +43,24 @@ If there is no Collection with the corresponding "parent" name or if you don't h
 
 {% image organizations/collection-nested-create.png Create a nested Collection %}
 
+## Delete a Collection
+
+Complete the following steps to delete a collection:
+
+1. Login to your [Web Vault](https://vault.bitwarden.com){:target="\_blank"} and open your Organization.
+2. In your Organization, open the **Manage** tab and select **Collections** from the left menu.
+3. On the **Collections** screen, hover over the Collection you want to delete and select the gear dropdown.
+4. From the gear dropdown, select **Delete**:
+
+   {% image /organizations/collection-delete.png Delete a Collection %}
+
+Deleting a Collection **will not** delete the Vault items in that Collection. When a Collection is deleted, Vault items will be moved to the {% icon fa-cube %} **Unassigned** filter in the Organization Vault view.
+
+
+
+
 ### Next Steps
 
-Now that you've created a Collection, we recommend that you:
+Once you've created a Collection, we recommend that you:
 - [Share Items to a Collection](https://bitwarden.com/help/article/share-to-a-collection/)
 - [Import Items to an Organization](https://bitwarden.com/help/article/import-to-org/)

_articles/organizations/managing-users.md

@@ -71,4 +71,8 @@ Complete the following steps to remove a user from your Organization:
 
 {% image organizations/org-people-options-updated-overlay.png Remove a user %}
 
-Once a user is removed they can no longer access any shared items or Collections.
+Removing a user from an Organization **does not** delete their Bitwarden account. When a user is removed they can no longer access the Organization or any shared items and Collections, however they will still be able to login to Bitwarden using the established credentials and access to any Personal Vault items.
+
+{% callout success %}
+If you're an Organization Owner or Admin removing a user with a `@yourcompany.com` email address, you can delete the Bitwarden account as long as you have access to the `@yourcompany.com` email inbox. For more information, see [Delete an Account Without Logging In](https://bitwarden.com/help/article/delete-your-account/#without-logging-in).
+{% endcallout %}

_articles/plans-and-pricing/2020-plan-updates.md

@@ -24,11 +24,17 @@ There have been no changes made to the **Premium** plan for individual users. Fo
 
 ## Families Organizations
 
-Upgrading from Classic 2019 to the current Families Organizations plan will increase your number of users from 5 to 6.
+Upgrading from Classic 2019 to the current Families Organizations plan will increase your number of users from 5 to 6. With the current plan, all 6 members of your Families Organization will automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
 
-With the current plan, all 6 members of your Families Organization will automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
+We've also reduced the price of a Families Organization to $40/year (*compared to $52/year for a Families Organization and Premium Features for all users*).
 
-We've reduced the price of a Families Organization to $40/year (*compared to $52/year for a Families Organization and Premium Features for all users*).
+### Families Comparison Table
+
+|Features|Classic 2019|Current (2020-)|
+|--------|------------|---------------|
+|No. of users|5|6|
+|For all members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, U2F)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|Cost|$52 / year (incl. separate purchase of Premium Features)|$40 / year|
 
 ## Teams Organizations
 
@@ -36,13 +42,27 @@ Upgrading from Classic 2019 to the current Teams Organizations plan will enable
 
 - Event Logs
 - User Groups
-- API access
+- API Access
 - Directory Connector
 
-With the current plan, all members of your Teams Organization will also automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
+Additionally, all members of your Teams Organization will receive access to all premium features for their personal Vaults, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
 
 There is no longer a minimum number of users required for a Teams Organization (*compared to 5 users min. for Classic 2019*). The improved Teams Organizations plan is $3 Per User Per Month (PUPM) (*compared to $2 PUPM for Classic 2019*).
 
+### Teams Comparison Table
+
+|Features|Classic 2019|Current (2020-)|
+|--------|------------|---------------|
+|Base no. of users|5|1|
+|Max no. of users|Unlimited|Unlimited|
+|For Organization items:<br><br>-Encrypted file attachements<br>-Bitwarden Authenticator (TOTP)<br>-Vealth Health Reports|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|For members of the Organization:<br><br>- Advanced 2FA Options (e.g. Duo, YubiKey, U2F)<br>- Encrypted file attachments<br>- Bitwarden Authenticator (TOTP)<br>- Vault Health Reports<br>- Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|Event Logs|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|User Groups|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|API Access|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|Directory Connector|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|Cost|$2 Per User Per Month, billed annually|$3 Per User Per Month, billed annually|
+
 ## Enterprise Organizations
 
 Upgrading from Classic 2019 to the current Enterprise plan unlocks the highly anticipated Login with SSO feature-set, simplifying access for enterprise users by fully integrating with your existing Identity Management solution.
@@ -51,36 +71,44 @@ As before, all members of your Enterprise Organization will automatically get al
 
 As before, there is no limit to the number of users in your Enterprise Organization. The current Enterprise Organizations plan is $5 Per User Per Month (*compared to $3 PUPM for Classic 2019 plan*).
 
+### Enterprise Comparison Table
+
+|Features|Classic 2019|Current (2020-)|
+|--------|------------|---------------|
+|Pre-existing Enterprise functionality, including:<br><br>-Premium features for all users<br>-Event Logs<br>-User Groups<br>-API access<br>-Directory Connector<br>-Enterprise Policies|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|Login with SSO|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|Cost|$3 Per User Per Month, billed annually|$5 Per User Per Month, billed annually|
+
 {% callout info %}
 Additional enterprise-only capabilities are planned which will only be available to the current plan, including expanded Enterprise Policies.
 {% endcallout %}
 
 ## FAQs About Changes
 
-### Q: When did these changes go into effect?
+#### Q: When did these changes go into effect?
 
 **A:** These changes went into effect on September 06, 2020. If you created your Bitwarden account before that date and have not yet upgraded, you are on a Classic 2019 plan.
 
-### Q: How do I upgrade from Classic 2019 to a current plan?
+#### Q: How do I upgrade from Classic 2019 to a current plan?
 
 **A:** [Contact Us](https://bitwarden.com/contact/) and select **Upgrade/Change Plan** from the **Subject** dropdown menu. Once you change your plan, your new pricing structure will be reflected on future invoices.
 
-### Q: If I want to stay on my Classic 2019 plan, do I need to do anything?
+#### Q: If I want to stay on my Classic 2019 plan, do I need to do anything?
 
 **A:** No. Your plan will stay as it is unless you take action to upgrade.
 
-### Q: If I stay on my Classic 2019 plan, will my pricing change?
+#### Q: If I stay on my Classic 2019 plan, will my pricing change?
 
 **A:** No. Your pricing will only change if you opt-in to upgrading to the current plans.
 
-### Q: Can I purchase a Families Organization without Premium features?
+#### Q: Can I purchase a Families Organization without Premium features?
 
 **A:** If you created your Families Organization before September 06, 2020, you can keep your Families (without Premium features) Organization simply by choosing not to upgrade to the current plan. Families Organizations created after September 06, 2020 will always have Premium features included.
 
-### Q: I have an Enterprise Organization, how do I upgrade my plan so that I can use Login with SSO?
+#### Q: I have an Enterprise Organization, how do I upgrade my plan so that I can use Login with SSO?
 
 **A:** [Contact Us](https://bitwarden.com/contact/) and select **Upgrade/Change Plan** from the **Subject** dropdown menu. We highly recommend you test Login with SSO by starting a [7 Day Enterprise Free Trial](https://bitwarden.com/help/article/enterprise-free-trial).
 
-### Q: I would like to test Login with SSO. If I decide I don't need it, can I revert to my Classic 2019 plan?
+#### Q: I would like to test Login with SSO. If I decide I don't need it, can I revert to my Classic 2019 plan?
 
 **A:** Unfortunately, we aren't able to revert you back to a Classic 2019 plan once you've upgraded. We recommend creating a new Organization to start a [7 Day Enterprise Free Trial](https://bitwarden.com/help/article/enterprise-free-trial/) to test Login with SSO outside of your Primary Organization.

_articles/plans-and-pricing/about-bitwarden-plans.md

@@ -46,12 +46,12 @@ In the following table, "premium features" (included for **Premium Individual**
 |Storage sync across devices|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |Secure Password Generator|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cloud or Self-hosting|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Encrypted Export|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Two-step login|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo|
-|*Encrypted file attachments|-|1 GB|1 GB per user + 1 GB shared|
-|*Bitwarden Authenticator (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Vault Health Reports|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Encrypted Export]({% link _articles/importing/encrypted-export.md %})|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo|
+|*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB|1 GB per user + 1 GB shared|
+|*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Vault Health Reports]({% link _articles/features/reports.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Emergency Access]({% link _articles/security/emergency-access.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |*Priority Support|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |Data sharing|-|-|Unlimited|
 |Cost to you|Free|$10 /year, billed annually|$40 /year, billed annually|
@@ -90,21 +90,21 @@ In the following table, "premium features" (included for **Teams Organizations**
 |Base no. of users|2|1|1|
 |Max no. of users|2|Unlimited|Unlimited|
 |Max no. of Collections|2|Unlimited|Unlimited|
-|*Encrypted Export|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Two-step login|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo|
-|*Encrypted file attachments|-|1 GB per user + 1 GB shared|1 GB per user + 1 GB shared|
-|*Bitwarden Authenticator (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-*Personal Emergency Access|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|*Vault Health Reports|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Encrypted Export]({% link _articles/importing/encrypted-export.md %})|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Two-step login]({% link _articles/two-step-login/setup-two-step-login.md %})|via authenticator apps or email|via authenticator apps, email, Yubikey, U2F, and Duo|via authenticator apps, email, Yubikey, U2F, and Duo|
+|*[Encrypted file attachments]({% link _articles/features/attachments.md %})|-|1 GB per user + 1 GB shared|1 GB per user + 1 GB shared|
+|*[Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) (TOTP)|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Personal Emergency Access]({% link _articles/security/emergency-access.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|*[Vault Health Reports]({% link _articles/features/reports.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
 |*Priority Support|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|Event Logs|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|User Groups|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|API access|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|Directory Connector|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
-|Login with SSO|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
-|Enterprise Policies|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
-|Custom Management Role|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
-|Self-host option|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Event Logs]({% link _articles/organizations/event-logs.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[User Groups]({% link _articles/organizations/about-groups.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[API access]({% link _articles/organizations/public-api.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Directory Connector]({% link _articles/directory-connector/directory-sync.md %})|-|<i class="fa fa-check" aria-hidden="true"></i>|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Login with SSO]({% link _articles/login-with-sso/about-sso.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Enterprise Policies]({% link _articles/organizations/policies.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Custom Management Role]({% link _articles/organizations/user-types-access-control.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
+|[Self-host option]({% link _articles/hosting/install-on-premise.md %})|-|-|<i class="fa fa-check" aria-hidden="true"></i>|
 |Cost to you|Free|$3 Per User Per Month, billed annually<br>or<br>$4 Per User Per Month, billed monthly|$5 Per User Per Month, billed annually<br>or<br>$6 Per User Per Month, billed monthly|
 
 ### Next Steps

_articles/plans-and-pricing/what-plan-is-right-for-me.md

@@ -80,7 +80,7 @@ However, only Enterprise Organizations include:
 - Enterprise Policies
 - Self-host option
 
-|If your answer is "Just the first few"...|If your answer is "I need all of them"...|
+|If your answer is "Almost all of them"...|If your answer is "I need all of them"...|
 |------------------------------------------------|------------------------------------------------|
 |...we recommend a Teams Organization.<br><br>[**Create your Teams Organization.**](https://bitwarden.com/help/article/upgrade-from-individual-to-org/)|...we recommend an Enterprise Organization.<br><br>[**Create your Enterprise Organization.**](https://bitwarden.com/help/article/upgrade-from-individual-to-org/)|
 

_articles/two-step-login/setup-two-step-login-authenticator.md

@@ -17,7 +17,7 @@ Complete the following steps to enable Two-step Login using an authenticator app
 {% callout warning %}
 **Losing access to your authenticator app can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place.
 
-[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen before enabling any method.
+[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
 {% endcallout %}
 
 1. Log in to your [Web Vault](https://vault.bitwarden.com/){:target="\_blank"}.

_articles/two-step-login/setup-two-step-login-duo.md

@@ -31,7 +31,7 @@ Complete the following steps to enable Two-step Login using Duo:
 {% callout warning %}
 **Losing access to your Duo-enabled device can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place.
 
-[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen before enabling any method.
+[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
 {% endcallout %}
 
 1. Log in to your [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.

_articles/two-step-login/setup-two-step-login-email.md

@@ -17,7 +17,7 @@ Complete the following steps to enable Two-step Login using email:
 {% callout warning %}
 **Losing access to your Two-step Login linked email can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place.
 
-[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen before enabling any method.
+[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
 {% endcallout %}
 
 1. Log in to your [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.

_articles/two-step-login/setup-two-step-login-u2f.md

@@ -28,7 +28,7 @@ Complete the following steps to enable Two-step Login using FIDO U2F:
 {% callout warning %}
 **Losing access to your FIDO U2F device can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place.
 
-[Get Your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen before enabling any method.
+[Get Your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
 {% endcallout %}
 
 1. Log in to the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.

_articles/two-step-login/setup-two-step-login-yubikey.md

@@ -19,7 +19,7 @@ Complete the following steps to enable Two-step Login using Yubikey:
 {% callout warning %}
 **Losing access to your Yubikey can permanently lock you out of your Vault,** unless you write down and keep your Two-step Login Recovery Code in a safe place.
 
-[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen before enabling any method.
+[Get your Recovery Code]({% link _articles/two-step-login/two-step-recovery-code.md %}) from the **Two-step Login** screen immediately after enabling any method.
 {% endcallout %}
 
 1. Log in to the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}.

_articles/two-step-login/two-step-recovery-code.md

@@ -11,7 +11,7 @@ order: 08
 Your Two-step Login Recovery Code is a 32 character alpha-numeric code that, when used, will deactivate all Two-step Login methods from your account. Recovery Codes are designed for scenarios where you have lost your Two-step Login Device.
 
 {% callout success %}
-Without your Recovery Code, losing access to your device or method will permanently lock you out of your Vault. Bitwarden highly recommends downloading your Recovery Code from the Two-step Login screen **before enabling any method**.
+Without your Recovery Code, losing access to your device or method will permanently lock you out of your Vault. Bitwarden highly recommends downloading your Recovery Code from the Two-step Login screen **immediately after enabling any method**.
 {% endcallout %}
 
 ## Get Your Recovery Code