Includes: (#385)

- New "Getting Started with Browser Extensions" article (+ re-ordering & 
images)
- Refurbished "Browser Extension Auto-fill Options" article (+ new 
images)
- File "storage" > File "attachments"
- E.A. Email Change Note
- New section in "About Login w/ SSO" highlighting the SSO Policy
- Steam TOTP section added to Authenticator article (+ an image)
- Clarification that Directory Connector != Login with SSO :)

_articles/directory-connector/directory-sync.md

@@ -10,7 +10,9 @@ order: 01
 
 ## What is Directory Connector?
 
-The Bitwarden **Directory Connector** application syncs users and groups to a Bitwarden Organization from a selection of directory services. Directory Connector will automatically provision and de-provision users, groups, and group associations from the source directory.
+The Bitwarden Directory Connector application syncs users and groups to a Bitwarden Organization from a selection of directory services. Directory Connector **will automatically provision and de-provision users, groups, and group associations** from the source directory.
+
+Directory Connector will issue invitations to synced users, however it will not automatically construct Bitwarden credentials based on any credentials stored in the source directory. Invited users will be required to follow the normal Organization onboarding procedure (see [Add or Remove Users](https://bitwarden.com/help/article/managing-users/#invited-users)) and log in with the created Bitwarden Master Password. 
 
 {% callout info %}
 Directory Connector functionality is available to **Teams** and **Enterprise** organizations. To use Directory Connector, you must be an Organization Admin or Owner (for more information, see [User Types and Access Control]({% link _articles/organizations/user-types-access-control.md %})).

_articles/faqs/org-faqs.md

@@ -21,7 +21,7 @@ For more high-level information about **Organizations**, refer to the following
 
 **A:** Organizations unlock access to secure sharing between users who are members of that Organization.
 
-Premium Individual plans unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file storage, and more. Premium Individual does not include secure data sharing.
+Premium Individual plans unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more. Premium Individual does not include secure data sharing.
 
 Paid Organizations (Families, Teams, or Enterprise) automatically include premium features (advanced 2FA options, Bitwarden Authenticator, etc.) for every user enrolled in the Organization.
 

_articles/features/authenticator-keys.md

@@ -64,3 +64,15 @@ For example:
 `otpauth://totp/Test:me?secret=JBSWY3DPEHPK3PXP&algorithm=sha256&digits=8&period=60`
 
 Learn more about using `otpauth://` URIs [here](https://github.com/google/google-authenticator/wiki/Key-Uri-Format).
+
+## Steam Guard TOTPs
+
+The Bitwarden Authenticator (TOTP) can be used as an alternative means of TOTP generation for Steam using a `steam://` prefix followed by your secret key (`shared_secret`):
+
+{% image steam-totp.png Steam TOTP generation%}
+
+Generated `steam://` TOTPs are by default alphanumeric and 5 digits, as opposed to traditional 6-digit numeric TOTPs.
+
+{% callout warning %}
+To use this functionality, you'll need to manually extract your Steam account's `shared_secret` using a third-party tool. There are tools like [SteamTimeIdler](https://github.com/SteamTimeIdler/stidler/wiki/Getting-your-%27shared_secret%27-code-for-use-with-Auto-Restarter-on-Mobile-Authentication#getting-shared-secret-from-ios-windows){:target="\_blank"} and [Steam Desktop Authenticator](https://github.com/Jessecar96/SteamDesktopAuthenticator){:target="\_blank"} that can help you accomplish this, however such **extraction tools are not officially supported by Bitwarden or Steam**. Use these tools at your own risk.
+{% endcallout%}

_articles/features/auto-fill-browser.md

@@ -1,75 +1,74 @@
 ---
 layout: article
-title: Auto-fill logins using the browser extension
+title: Browser Extension Auto-fill Options
 categories: [miscellaneous]
 featured: false
 popular: false
 tags: [browser, auto-fill, autofill]
 ---
 
-You can use the Bitwarden browser extension to easily auto-fill login forms on websites with your username/email and password credentials.
+{% callout success %}
+Most auto-fill functionality relies on the attribution of URIs to Login items. If you're unfamiliar with using URIs, see [URIs for Vault Items]({% link _articles/features/uri-match-detection.md %}).
+{% endcallout %}
 
-## How to add a website to a saved login
+Bitwarden Browser Extensions have a unique **Tab** view, which automatically detects the URI (e.g. `myturbotax.intuit.com`) of the page displayed in the open tab and surfaces any Vault items with corresponding URIs.
 
-To use most auto-fill features, you need to add the website URL to the login details you have saved in Bitwarden.
+When a Vault item has a corresponding URI, the Bitwarden icon will overlay a notification bubble reporting the number of Vault items for that web page (*pictured below*).
 
-You can manually edit the websites associated with a login in the "Edit" page for that login. The URI list shows the websites currently associated with the login. If you create a new login while you have the website open, the website will automatically appear in the URI list.
+{% image /getting-started/browserext/browserext-tab.png %}
 
-{% image autofill-uri-list.png %}
+Simply clicking on the Vault item inside the Browser Extension will auto-fill login information to the detected input fields.
 
-Alternatively, you can auto-fill the login for the current website and add the website to that login by clicking the **Auto-fill and Save** button on the "View Item" screen for that login.
+There are a few alternative auto-fill options for Browser Extensions. In all cases (except [manually](#manually-auto-fill)):
+- The Browser Extension must be unlocked for the auto-fill functionality to operate.
+- In cases where a web page or service has **multiple** Login items with relevant URIs, it will auto-fill the last-used Login.
 
-{% image autofill-autofill-and-save.png %}
+## Using the Context-Menu
 
-## How to auto-fill
+{% callout info %}
+Currently unavailable in the Safari Browser Extension.
+{% endcallout %}
 
-There are a variety of ways to perform auto-fill operations with Bitwarden.
+Without opening your Browser Extension, you can right-click on the username or password input field and use the **Bitwarden** → **Auto-fill** option. Your Vault must be unlocked for this option to be available.
 
-### Popup window
+{% image /getting-started/browserext/browserext-context.png %}
 
-The Bitwarden icon in the toolbar of your browser will show the number of logins in your vault that match the current website you are viewing. Selecting the Bitwarden icon will open the Bitwarden popup window, defaulting to the "Current Tab" page. The "Current Tab" page shows a listing of these matching logins.
+## Using Keyboard Shortcuts
 
-If you are currently viewing a login form on a website, selecting a login from the "Current Tab" list will result in the login credentials being auto-filled into the login form.
+Bitwarden Browser Extensions provide a set of keyboard shortcuts (a.k.a *hot keys*) to auto-fill login information. Your Vault must be unlocked for these options to be available.
 
-{% image autofill-popup.png %}
+To auto-fill login information, use the following **default** shortcuts:
 
-If the login does not appear in the "Current Tab" page, you can open the login from your Vault and click the **Auto-fill** button. This will auto-fill the current website even if that website is not associated with the login.
+- On Windows: `Ctrl + Shift + L`
+- On macOS: `Cmd + Shift + L`
+- On Linux: `Ctrl + Shift + L`
+- Safari: `Cmd + \` or `Cmd + 8` or `Cmd + Shift + P`
 
-### Right-click context menu
+{% callout success %}
+If a login uses the [Bitwarden Authenticator]({% link _articles/features/authenticator-keys.md %}) for TOTPs, using the `Cmd/Ctrl + Shift + L` will automatically copy your TOTP to your clipboard after auto-filling. All you have to do is `Cmd/Ctrl + V` to paste!
+{% endcallout %}
 
-{% callout info %}This feature is currently unavailable in Safari browser.{% endcallout %}
+If any given shortcut doesn't work, it's likely because another application on your device is already registered to use it. For example, the auto-fill shortcut on Windows is commonly claimed by the AMD Radeon Adrenaline software (AMD graphic drivers) and therefore cannot be used by Bitwarden. In these instances, you should free up the shortcut or configure Bitwarden to use a different shortcut.
 
-The same list of logins that are available when using the popup window are also available from the convenience of the right-click context menu in your browser.
+### Configuring Keyboard Shortcuts
 
-{% image autofill-context-menu.png %}
+Configuring the keyboard shortcuts used by a Bitwarden Browser Extension differs based on which browser you're using. To access the configuration menu:
 
-### Keyboard shortcuts (hot keys)
+- **In Chrome**, enter `chrome://extensions/shortcuts` in the address bar.
 
-You can use a set of keyboard shortcuts (hot keys) to quickly auto-fill a login form. When viewing the login form press the keyboard shortcut (see below) and the last used login for that website will be auto-filled.
+   In Chromium-based browsers like **Brave**, substitute `chrome` for the relevant browser name (e.g. `brave://extensions/shortcuts`).
+- **In Firefox**, enter `about:addons` in the address bar, select the {% icon fa-cog %} **Gear** icon next to **Manage Your Extensions**, and select **Manage Extension Shortcuts** from the dropdown.
 
-- Windows: `Ctrl + Shift + L`
-- Linux: `Ctrl + Shift + L`
-- macOS: `Cmd + Shift + L`
-  - Safari: `Cmd + \` or `Cmd + 8` or `Cmd + Shift + P`
+Some browsers, including **Safari** and legacy **Edge** do not currently support changing the default keyboard shortcuts for extensions.
 
-{% callout info %}If a shortcut does not work, it may be because another application on your device is already using it. For example, the auto-fill shortcut on Windows is commonly claimed by the AMD Radeon Adrenaline software (AMD graphic drivers) and therefore cannot be used by Bitwarden. You can free up this shortcut by changing it in the AMD Radeon software under Gaming → Global Settings → Performance Monitoring: "Toggle Performance Logging Hotkey".{% endcallout %}
+## On Page Load
 
-Another option is to open the popup window using the keyboard shortcut (see below). You can then `TAB` to the login that you would like to auto-fill and then press `ENTER` to select.
+Auto-fill on Page Load is an **experimental and opt-in** feature offered by Bitwarden Browser Extensions. When enabled, Bitwarden will auto-fill login information when a web page corresponding to a Login item's URI value loads.
 
-- Windows: `Ctrl + Shift + Y`
-- Linux: `Ctrl + Shift + U`
-- macOS: `Cmd + Shift + Y`
+If there are multiple Login items with the detected URI, the last-used login will be used for the auto-full operation.
 
-You can easily customize these keyboard shortcuts in Chrome, Opera, Edge, and Brave browsers. In the address bar navigate to `chrome://extensions` and locate the "Keyboard shortcuts" button (you may need to scroll to the bottom).
+To enable this feature, navigate to **Settings** → **Options** in your Browser Extension, and select the **Enable Auto-fill On Page Load** option.
 
-In Firefox, you need can go to the addons preference page. Under the gears icon click the "Manage Extension Shortcuts" as explained [here](https://support.mozilla.org/en-US/kb/manage-extension-shortcuts-firefox).
+## Manually Auto-fill
 
-Other browsers such as Safari and legacy Edge do not currently support changing the default keyboard shortcuts for extensions.
-
-### Auto-fill on page load
-
-Bitwarden includes an experimental feature to auto-fill logins immediately after a webpage containing a login form loads in your browser. This feature requires you to opt-in to use it. You can enable "Auto-fill On Page Load" under **Settings** → **Options**.
-
-{% image autofill-extension-option.png %}
-
-In the case of multiple logins matching the current website, the last used login will be used for the auto-fill operation. If the wrong login is auto-filled, you can auto-fill again using the popup window and reset the last used login.
+You can auto-fill items manually that don't have saved URIs by opening them in the {% icon fa-lock %} **My Vault** view, and selecting the **Auto-fill** button.

_articles/getting-started/getting-started-browserext.md

@@ -0,0 +1,106 @@
+---
+layout: article
+title: Get Started with Browser Extensions
+categories: [getting-started]
+featured: false
+popular: false
+hidden: false
+tags: [tutorial, browser extensions]
+order: 04
+---
+
+Bitwarden Browser Extensions integrate password management directly into your favorite browser. Download a Bitwarden Browser Extension from your browser's marketplace or app store, or from the [Bitwarden Downloads](https://bitwarden.com/download){:target="\_blank"} page. Browser Extensions are available for:
+
+- Google Chrome
+- Mozilla Firefox
+- Opera
+- Microsoft Edge
+- Vivaldi
+- Brave
+- Tor Browser
+- Safari
+
+{% callout success %}
+**The Safari Browser Extension is packaged with the Desktop Application**, available for download from the App Store. For more information, see [Safari App Extension]({% link _articles/account/install-safari-app-extension.md %}).
+{% endcallout %}
+
+{% image /getting-started/browserext/browserext-vault.png Bitwarden Browser Extension in Google Chrome %}
+
+## Explore your Vault
+
+In the {% icon fa-lock %} **My Vault** view, you can browse all items in your Bitwarden Vault.
+
+When you **Favorite** an item, it'll appear at the top of your Vault for easy access. Items are also sorted into **Types** (*Login, Card, Identity, or Secure Note*) and **Folders**. If you're a member of an Organization, **Collections** will also appear in your Vault.
+
+### Get Organized with Favorites and Folders
+
+Organizing your Vault into **Favorites** and **Folders** makes navigating your Vault a breeze:
+
+1. Select the item you want to edit.
+2. Select **Edit** in the top-right corner of the Browser Extension.
+3. Select a **Folder** from the dropdown to add this item to a folder, or check the **Favorite** checkbox to add it to your Favorites.
+4. Select **Save** in the top-right corner of the Browser Extension.
+
+For more information, see [Folders]({% link _articles/features/folders.md %}) and [Favorites]({% link _articles/features/favorites.md %}).
+
+## Add a Login
+
+Any time you log in to a website that doesn't already have a Login item saved for it, Bitwarden will offer to remember the login information for you:
+
+{% image /getting-started/browserext/browserext-add.png %}
+
+Selecting **Yes, Save Now** will automatically add a Login item to your Vault with the entered username, password, and URI. If you're unfamiliar with using URIs, see [URIs for Vault Items]({% link _articles/features/uri-match-detection.md %}).
+
+{% callout success %}
+You can disable this banner by selecting the **Disable Add Login Notification** option from the **Options** menu in your Browser Extension.
+{% endcallout %}
+
+## Launch a Website
+
+You can launch a website directly from the Bitwarden Browser Extension by selecting the {% icon fa-share-square %} **Launch** button in any Vault item with a valid URI. If you're unfamiliar with using URIs, see [URIs for Vault Items]({% link _articles/features/uri-match-detection.md %}).
+
+{% image /getting-started/browserext/browserext-launch.png %}
+
+## Auto-fill Login Information
+
+Bitwarden Browser Extensions have a unique **Tab** view, which automatically detects the URI (e.g. `myturbotax.intuit.com`) of the page displayed in the open tab and surfaces any Vault items with corresponding URIs.
+
+When a Vault item has a corresponding URI, the Bitwarden icon will overlay a notification bubble reporting the number of Vault items for that web page (*pictured below*).
+
+{% image /getting-started/browserext/browserext-tab.png %}
+
+Simply clicking on the Vault item inside the Browser Extension will auto-fill login information to the detected input fields.
+
+There are a few other methods of auto-filling login information from your Browser Extension, including context menus and keyboard shortcuts. To learn about them, see [Browser Extension Auto-fill Options]({% link _articles/features/auto-fill-browser.md %}).
+
+## Unlock with PIN / Biometrics
+
+For lightening fast access to your credentials, setup a PIN or Biometrics to unlock you Vault. To setup a PIN:
+
+1. In your Browser Extension, open the {% icon fa-cogs %} **Settings** tab.
+2. In the Security section, check the **Unlock with PIN** checkbox.
+3. Enter the desired PIN code in the input box. PIN codes can be any combination of characters (a-z, 0-9, $, #, etc.)
+
+   {% callout success%}**Optional:** The pre-check option **Lock with master password on browser restart** will require you to enter your Master Password instead of a PIN when your browser restarts. If you want to be able to unlock with a PIN when you browser restarts, uncheck this option.{% endcallout %}
+
+For more information, see [Unlock with PIN]({% link _articles/account/unlock-with-pin.md %}) or [Unlock with Biometrics]({% link _articles/account/biometrics.md %}).
+
+## Pin an Extension
+
+Pinning the Browser Extension will ensure that it's easily accessible each time you open your Browser. The procedure differs based on which browser you're using:
+
+- **For Chrome**, select the {% icon fa-puzzle-piece %} **Extensions** icon to the right of the address bar and select the **Pin** icon next to Bitwarden in your Extensions list.
+
+   {% image chrome-pin.png %}
+- **For Firefox**, enter `about:addons` in the address bar and toggle the Bitwarden Extension on. To customize *where* it appears in your browser, right-click the Bitwarden Browser Extension icon and select **Customize...** to open a drag-and-drop interface that lets you move or remove icons in your toolbar. You can also use the **Pin to Overflow Menu** option to pin Bitwarden to an overflow (**>>**) menu:
+
+   {% image ff-overflowpin.png %}
+- For Safari, right-click anywhere in the tool bar and select **Customize Toolbar** to open a drag-and-drop interface that lets you move or remove icons in your toolbar.
+
+   {% image safari-pin.png %}
+
+## Bitwarden 101: Getting Started with Browser Extensions
+
+Use the following video for help getting started using Bitwarden Browser Extensions:
+
+<iframe class="embed-responsive" width="800" height="450" src="https://www.youtube.com/embed/Epx6bLBsYlI" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

_articles/getting-started/getting-started-ios.md

@@ -83,7 +83,7 @@ Once you've setup [Auto-fill](#setup-auto-fill) and [Biometrics](#unlock-with-bi
 
 ## Bitwarden 101: Get Started with iOS
 
-Use this following Video or Slideshow for help getting started using Bitwarden for iOS:
+Use the following video or slideshow for help getting started using Bitwarden for iOS:
 
 <iframe width="800" height="450" src="https://www.youtube.com/embed/LrhMmNTmOno" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 <br>

_articles/getting-started/getting-started-organizations.md

@@ -6,7 +6,7 @@ featured: false
 popular: false
 hidden: false
 tags: [tutorial]
-order: 04
+order: 05
 ---
 
 With the Bitwarden free account, and a free Organization for up to 2 users, you can experience secure sharing in no time!
@@ -48,7 +48,7 @@ For more, please see [About Organizations](https://bitwarden.com/help/article/ab
 
 Yes. Organizations are for sharing items across multiple users. Premium membership gives your individual user account additional premium features including:
 
-- 1GB encrypted file storage
+- 1GB encrypted file attachments
 - Two-step login with YubiKey, FIDO U2F, & Duo
 - Password hygiene & vault health reports
 - TOTP authenticator key storage & code gen.

_articles/getting-started/getting-started-videos.md

@@ -5,7 +5,7 @@ categories: [getting-started]
 featured: true
 popular: false
 tags: [getting started, videos, bitwarden 101]
-order: 16
+order: 07
 ---
 
 ## Bitwarden 101 - Getting Started

_articles/login-with-sso/about-sso.md

@@ -22,6 +22,10 @@ Administrators can configure Login with SSO in the Business Portal. For more inf
 
 {% image /sso/sso-button-lg.png Enterprise Single Sign-On button %}
 
+### Requiring SSO for Users
+
+Using the **Single Sign-On Authentication** policy, Enterprise Organizations can require non-Owner/non-Admin users to log in to Bitwarden with Enterprise Single Sign-On. For more information about setting up this policy, see [Policies]({% link _articles/organizations/policies.md %}).
+
 ## Enterprise Free Trial
 
 Login with SSO is available for all customers on the current Enterprise plan (for more information, see [About Bitwarden Plans]({% link _articles/plans-and-pricing/about-bitwarden-plans.md %}). If you're new to Bitwarden, we'd love to help you through the process of setting up an account and starting your 7 Day Free Trial Enterprise Organization with our dedicated signup page:

_articles/organizations/about-organizations.md

@@ -44,7 +44,7 @@ Enterprise Organizations allow unlimited users (*billed Per User Per Month*) to
 
 **Organizations unlock access to secure sharing** between users who are members of that Organization.
 
-Premium Individual plans unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file storage, and more. **Premium Individual does not include secure data sharing.**
+Premium Individual plans unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more. **Premium Individual does not include secure data sharing.**
 
 **Paid Organizations** (Families, Teams, or Enterprise) automatically include premium features (advanced 2FA options, Bitwarden Authenticator (TOTP), etc.) for every user enrolled in the Organization.
 

_articles/organizations/create-an-organization.md

@@ -44,7 +44,7 @@ Complete the following steps to create an Organization:
    {% endcallout %}
 6. If you selected a Paid Organization, enter the following information:
    - For **Teams** or **Enterprise**, enter the number of **User Seats** you need. You can add additional seats later if required.
-   - For **Families**, **Teams**, or **Enterprise**, enter the amount of **Additional Storage (GB)** you need. You plan comes with 1 GB of shared encrypted file storage, and you can add additional storage later if needed.
+   - For **Families**, **Teams**, or **Enterprise**, enter the amount of **Additional Storage (GB)** you need. You plan comes with 1 GB of shared encrypted file attachments, and you can add additional storage space later if needed.
    - For **Teams** or **Enterprise**, select whether you'd like to be billed **Annually** or **Monthly**. Families Organizations may only be billed annually.
    - For any Paid Organization, enter your **Payment Information**
 7. Click **Submit** to start using your new Organization.

_articles/organizations/deploying-bitwarden-as-a-msp.md

@@ -6,7 +6,7 @@ featured: false
 popular: false
 hidden: false
 tags: [tutorial]
-order: 05
+order: 06
 ---
 If you are looking for information about the Bitwarden Partner Program, look no further. Bitwarden supports a reseller and managed service provider (MSP) model. You can get started right away (no formal agreement needs to be signed).
 

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

@@ -26,7 +26,7 @@ There have been no changes made to the **Premium** plan for individual users. Fo
 
 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 storage, 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 reduced the price of a Families Organization to $40/year (*compared to $52/year for a Families Organization and Premium Features for all users*).
 
@@ -39,7 +39,7 @@ Upgrading from Classic 2019 to the current Teams Organizations plan will enable
 - 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 storage, and more.
+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.
 
 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*).
 
@@ -47,7 +47,7 @@ There is no longer a minimum number of users required for a Teams Organization (
 
 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.
 
-As before, all members of your Enterprise Organization will automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file storage, and more.
+As before, all members of your Enterprise Organization will automatically get all premium features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, and more.
 
 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*).
 

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

@@ -24,7 +24,7 @@ We believe everyone should have access to password security tools. The core feat
 
 ### Premium Individual
 
-Upgrade your individual Bitwarden account to unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file storage, emergency access and more. Upgrade **[now](https://vault.bitwarden.com/#/?premium=purchase)**.
+Upgrade your individual Bitwarden account to unlock premium password security and management features, including advanced 2FA options, the Bitwarden Authenticator (TOTP), encrypted file attachments, emergency access and more. Upgrade **[now](https://vault.bitwarden.com/#/?premium=purchase)**.
 
 {% callout info %}
 Premium does not include secure data sharing. In order to access sharing features, you will need a subscription to an Organization ([Free](#free-organizations), [Families](#families-organizations), [Teams](#teams-organizations), or [Enterprise](#enterprise-organizations)). Paid Organizations ([Families](#families-organizations), [Teams](#teams-organizations), or [Enterprise](#enterprise-organizations)) include premium features for all users enrolled in that Organization.
@@ -48,7 +48,7 @@ In the following table, "premium features" (included for **Premium Individual**
 |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 storage|-|1 GB|1 GB per user + 1 GB shared|
+|*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>|
@@ -92,7 +92,7 @@ In the following table, "premium features" (included for **Teams Organizations**
 |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 storage|-|1 GB per user + 1 GB shared|1 GB per user + 1 GB shared|
+|*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>|

_articles/plans-and-pricing/enterprise-free-trial.md

@@ -35,7 +35,7 @@ If you already have a Bitwarden account, complete the following steps to start y
    - Provide your **Business Name**.
 5. Select the **Enterprise** plan option. Doing so will trigger additional enterprise-oriented fields to be displayed.
 6. In the **Users** section, enter the number of **User Seats** you need. You can add additional seats later if required.
-7. In the **Addons** section, enter the amount of **Additional Storage (GB)** you need. Your plan comes with 1 GB of shared encrypted file storage, and you can add additional storage later if required.
+7. In the **Addons** section, enter the amount of **Additional Storage (GB)** you need. Your plan comes with 1 GB of shared encrypted file attachments, and you can add additional storage later if required.
 8. In the **Summary** section, select whether you'd like to be billed **Annually** or **Monthly**.
 9. Enter your **Payment Information** and select **Submit**.
 

_articles/plans-and-pricing/premium-renewal.md

@@ -26,7 +26,7 @@ You will **not** be locked out of your Vault, however you will not be able to us
 
 Your secret keys will remain stored in Vault items in the **Authenticator Key (TOTP)** field, however Bitwarden will not generate TOTP codes.
 
-**Encrypted File Storage**
+**Encrypted File Attachments**
 
 Files will **not** be deleted from your Vault, however you will not be able to upload or download.
 

_articles/plans-and-pricing/upgrade-from-individual-to-org.md

@@ -39,7 +39,7 @@ Complete the following steps to start your Organization:
    {% endcallout %}
 6. If you selected a Paid Organization, enter the following information:
    - For **Teams** or **Enterprise**, enter the number of **User Seats** you need. You can add additional seats later if required.
-   - For **Families**, **Teams**, or **Enterprise**, enter the amount of **Additional Storage (GB)** you need. You plan comes with 1 GB of shared encrypted file storage, and you can add additional storage later if needed.
+   - For **Families**, **Teams**, or **Enterprise**, enter the amount of **Additional Storage (GB)** you need. You plan comes with 1 GB of shared encrypted file attachments, and you can add additional storage later if needed.
    - For **Teams** or **Enterprise**, select whether you'd like to be billed **Annually** or **Monthly**. Families Organizations may only be billed annually.
    - For any Paid Organization, enter your **Payment Information**
 7. Click **Submit** to start using your new Organization.

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

@@ -43,7 +43,7 @@ Will you be a Bitwarden Solo-Practitioner, or will you securely share data betwe
 As a Bitwarden Solo-Practicioner, will you be a Bitwarden Black Belt using Premium features like:
 
 - Advanced 2FA options, like Yubikey, U2F, and Duo
-- 1 GB of encrypted file storage
+- 1 GB of encrypted file attachments
 - Bitwarden Authenticator (TOTP)
 - Emergency Access
 - Vault Health Reports

_articles/plans-and-pricing/why-choose-bitwarden-for-your-team.md

@@ -51,7 +51,7 @@ Bitwarden Teams Plan has a robust set of password management features.
   |Password Strength Checker | <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>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
   |Password Sharing | <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>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
 |Multi-Device Sync| <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>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
-|Encrypted File Storage| 1GB          | 1GB                                                      | —                       | —                              |  1GB+ Personal, 1GB+ for Org Items
+|Encrypted File Attachments| 1GB          | 1GB                                                      | —                       | —                              |  1GB+ Personal, 1GB+ for Org Items
 |Built-in TOTP| <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>|
 
 ## Security and Administration Features
@@ -92,8 +92,3 @@ Cloud-Hosted               | <i class="fa fa-check" aria-hidden="true"></i>
     |Windows and Mac               | <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>                        | <i class="fa fa-check" aria-hidden="true"></i>                               |  <i class="fa fa-check" aria-hidden="true"></i>
     |Linux               | <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>                        | —                               |  <i class="fa fa-check" aria-hidden="true"></i>
      |Command Line Interface               | <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> |
-
-
-
-
-

_articles/security/emergency-access.md

@@ -37,6 +37,12 @@ Emergency Access relies on public key exchange within Bitwarden, therefore trust
 
 There is no limit to the number of trusted emergency contacts a user can have.
 
+{% callout note %}
+A user's status as a trusted emergency contact is tied to a unique Bitwarden account ID, meaning that if a grantee [changes their email address]({% link _articles/faqs/product-faqs.md %}) there is no reconfiguration required to maintain their emergency access.
+
+If a grantee creates a **new Bitwarden account** and [deletes]({% link _articles/account/delete-your-account.md %}) the old account which had been specified as a trusted emergency contact, they will automatically be removed from the grantor's list and must be [re-invited](#invite-a-trusted-emergency-contact).
+{% endcallout %}
+
 ### User Access
 
 Trusted emergency contacts can be granted one of the following user access levels: