diff --git a/assets/images/help/organizations/org-settings-link.png b/assets/images/help/organizations/org-settings-link.png
new file mode 100644
index 0000000000..8d82b8ef6d
Binary files /dev/null and b/assets/images/help/organizations/org-settings-link.png differ
diff --git a/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md b/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
index b54a582e50..66aeac73c8 100644
--- a/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
+++ b/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md
@@ -54,9 +54,8 @@ topics:
 
 An organization administrator can only configure hook permissions for an organization if the site administrator selected the **Administrators can enable or disable this hook** option when they created the pre-receive hook. To configure pre-receive hooks for a repository, you must be an organization administrator or owner.
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 4. In the left sidebar, click **Hooks**.
 ![Hooks sidebar](/assets/images/enterprise/orgs-and-teams/hooks-sidebar.png)
 5. Next to the pre-receive hook that you want to configure, click the **Hook permissions** drop-down menu. Select whether to enable or disable the pre-receive hook, or allow it to be configured by the repository administrators.
diff --git a/content/admin/user-management/adding-people-to-teams.md b/content/admin/user-management/adding-people-to-teams.md
index 522d39f391..389c4a5052 100644
--- a/content/admin/user-management/adding-people-to-teams.md
+++ b/content/admin/user-management/adding-people-to-teams.md
@@ -23,8 +23,8 @@ Each team has its own individually defined [access permissions for repositories
 
 ### Setting up a team
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.invite_to_team %}
 {% data reusables.organizations.review-team-repository-access %}
diff --git a/content/admin/user-management/creating-teams.md b/content/admin/user-management/creating-teams.md
index d45949ba68..216ed506f5 100644
--- a/content/admin/user-management/creating-teams.md
+++ b/content/admin/user-management/creating-teams.md
@@ -23,8 +23,8 @@ Organizations can create multiple levels of nested teams to reflect a company or
 
 A prudent combination of teams is a powerful way to control repository access. For example, if your organization allows only your release engineering team to push code to the default branch of any repository, you could give only the release engineering team **admin** permissions to your organization's repositories and give all other teams **read** permissions.
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.new_team %}
 {% data reusables.organizations.team_name %}
 {% data reusables.organizations.team_description %}
@@ -48,8 +48,8 @@ Instances using LDAP for user authentication can use LDAP Sync to manage a team'
 {% endwarning %}
 
 1. Ensure that [LDAP Sync is enabled](/enterprise/admin/authentication/using-ldap#enabling-ldap-sync).
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.new_team %}
 {% data reusables.organizations.team_name %}
 6. Search for an LDAP group's DN to map the team to. If you don't know the DN, type the LDAP group's name. {% data variables.product.prodname_ghe_server %} will search for and autocomplete any matches.
diff --git a/content/admin/user-management/removing-users-from-teams-and-organizations.md b/content/admin/user-management/removing-users-from-teams-and-organizations.md
index 2230bb733e..3e0951f73a 100644
--- a/content/admin/user-management/removing-users-from-teams-and-organizations.md
+++ b/content/admin/user-management/removing-users-from-teams-and-organizations.md
@@ -31,8 +31,8 @@ To remove an existing member of a team synced to an LDAP group, contact your LDA
 
 {% endwarning %}
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 4. Select the person or people you'd like to remove.
 ![Check box next to organization member](/assets/images/help/teams/team-member-check-box.png)
@@ -41,8 +41,8 @@ To remove an existing member of a team synced to an LDAP group, contact your LDA
 
 ### Removing a user from an organization
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Next to the name of the users you want to remove from the organization, click the check box.
 ![Remove user checkbox](/assets/images/help/organizations/Organization-remove-user.png)
diff --git a/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md b/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md
index 07c68c993c..9e44c69d18 100644
--- a/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md
+++ b/content/admin/user-management/requiring-two-factor-authentication-for-an-organization.md
@@ -36,9 +36,8 @@ Before you can require organization members and outside collaborators to use 2FA
 
 Before you require use of two-factor authentication, we recommend notifying organization members and outside collaborators and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/enterprise/{{ currentVersion }}/user/articles/viewing-whether-users-in-your-organization-have-2fa-enabled) on an organization's People tab.
 
-{% data reusables.profile.enterprise_access_profile %}
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.org_settings %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.security %}
 {% data reusables.organizations.require_two_factor_authentication %}
 {% data reusables.organizations.removed_outside_collaborators %}
diff --git a/content/code-security/security-overview/exploring-security-alerts.md b/content/code-security/security-overview/exploring-security-alerts.md
index 45c7c67a68..ffb1651a8f 100644
--- a/content/code-security/security-overview/exploring-security-alerts.md
+++ b/content/code-security/security-overview/exploring-security-alerts.md
@@ -49,8 +49,8 @@ Organization owners can view the security overview for an organization.
 
 Members of a team can see the security overview for repositories that the team has admin privileges for.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-security-overview %}
 {% data reusables.organizations.filter-security-overview %}
diff --git a/content/github/managing-your-work-on-github/creating-a-project-board.md b/content/github/managing-your-work-on-github/creating-a-project-board.md
index c422de1fa7..761796a352 100644
--- a/content/github/managing-your-work-on-github/creating-a-project-board.md
+++ b/content/github/managing-your-work-on-github/creating-a-project-board.md
@@ -46,8 +46,8 @@ You can also configure workflow automations to keep your project board in sync w
 
 ### Creating an organization-wide project board
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.click-new-project %}
 {% data reusables.project-management.create-project-name-description %}
diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle.md
index 4cd79a1572..adccf8d1b0 100644
--- a/content/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle.md
+++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle.md
@@ -27,16 +27,16 @@ When you change your billing cycle's duration, your {% data variables.product.pr
 
 #### Changing the duration of a per-user subscription
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.change_plan_duration %}
 {% data reusables.dotcom_billing.confirm_duration_change %}
 
 #### Changing the duration of a legacy per-repository plan
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
 {% data reusables.organizations.billing_plans %}
 4. Under "Billing overview", click **Change plan**.
   ![Billing overview change plan button](/assets/images/help/billing/billing_overview_change_plan.png)
diff --git a/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md b/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
index b60b06cfc3..a9e2035513 100644
--- a/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
+++ b/content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
@@ -66,8 +66,8 @@ If you already have a personal {% data variables.product.prodname_dotcom %} user
 
 ### Step 5: Invite your client to join the organization
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.invite_member_from_people_tab %}
 5. Type your client's {% data variables.product.prodname_dotcom %} username and press **Enter**.
@@ -78,8 +78,8 @@ If you already have a personal {% data variables.product.prodname_dotcom %} user
 
 ### Step 6: Transfer organization ownership to your client
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Confirm that your client is listed among the members of the organization and is assigned the *owner* role.
 5. To the right of your username, use the {% octicon "gear" aria-label="The Settings gear" %} drop-down menu, and click **Manage**.
diff --git a/content/github/setting-up-and-managing-your-github-user-account/accessing-an-organization.md b/content/github/setting-up-and-managing-your-github-user-account/accessing-an-organization.md
index 1d65faf75d..88809bd29f 100644
--- a/content/github/setting-up-and-managing-your-github-user-account/accessing-an-organization.md
+++ b/content/github/setting-up-and-managing-your-github-user-account/accessing-an-organization.md
@@ -19,5 +19,5 @@ topics:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
diff --git a/content/github/setting-up-and-managing-your-github-user-account/publicizing-or-hiding-organization-membership.md b/content/github/setting-up-and-managing-your-github-user-account/publicizing-or-hiding-organization-membership.md
index f9c2d64a5c..39e0710b77 100644
--- a/content/github/setting-up-and-managing-your-github-user-account/publicizing-or-hiding-organization-membership.md
+++ b/content/github/setting-up-and-managing-your-github-user-account/publicizing-or-hiding-organization-membership.md
@@ -16,8 +16,8 @@ topics:
 
 ### Changing the visibility of your organization membership
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Locate your username in the list of members. If the list is large, you can search for your username in the search box.
 ![Organization member search box](/assets/images/help/organizations/member-search-box.png)
diff --git a/content/github/setting-up-and-managing-your-github-user-account/viewing-peoples-roles-in-an-organization.md b/content/github/setting-up-and-managing-your-github-user-account/viewing-peoples-roles-in-an-organization.md
index d7abcee022..6e5bda6132 100644
--- a/content/github/setting-up-and-managing-your-github-user-account/viewing-peoples-roles-in-an-organization.md
+++ b/content/github/setting-up-and-managing-your-github-user-account/viewing-peoples-roles-in-an-organization.md
@@ -17,8 +17,8 @@ topics:
 
 {% endnote %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. You will see a list of the people in your organization. To filter the list by role, click **Role** and select the role you're searching for.
   ![click-role](/assets/images/help/organizations/view-list-of-people-in-org-by-role.png)
diff --git a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
index 99f2c55869..d42af421a0 100644
--- a/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
+++ b/content/organizations/collaborating-with-groups-in-organizations/viewing-insights-for-your-organization.md
@@ -26,8 +26,8 @@ You can use organization activity insights to help you better understand how mem
 
 With organization activity insights you can view weekly, monthly, and yearly data visualizations of your entire organization or specific repositories, including issue and pull request activity, top languages used, and cumulative information about where your organization members spend their time.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 3. Under your organization name, click {% octicon "graph" aria-label="The bar graph icon" %} **Insights**.
   ![Click the organization insights tab](/assets/images/help/organizations/org-nav-insights-tab.png)
 4. Optionally, in the upper-right corner of the page, choose to view data for the last **1 week**, **1 month**, or **1 year**.
@@ -38,8 +38,8 @@ With organization activity insights you can view weekly, monthly, and yearly dat
 ### Viewing organization dependency insights
 With dependency insights you can view vulnerabilities, licenses, and other important information for the open source projects your organization depends on.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 3. Under your organization name, click {% octicon "graph" aria-label="The bar graph icon" %} **Insights**.
   ![Insights tab in the main organization navigation bar](/assets/images/help/organizations/org-nav-insights-tab.png)
 4. To view dependencies for this organization, click **Dependencies**.
diff --git a/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
index 4a0da7b07d..3fb5577846 100644
--- a/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
+++ b/content/organizations/collaborating-with-your-team/creating-a-team-discussion.md
@@ -15,8 +15,8 @@ topics:
 
 {% data reusables.organizations.team-discussions-permissions %} For more information, see "[About team discussions](/organizations/collaborating-with-your-team/about-team-discussions)."
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-discussions-tab %}
 6. Type a team discussion title and a comment to start a conversation.
diff --git a/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
index 1bf03d820d..a523243570 100644
--- a/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
+++ b/content/organizations/collaborating-with-your-team/editing-or-deleting-a-team-discussion.md
@@ -13,8 +13,8 @@ topics:
   - Community
 ---
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-discussions-tab %}
 6. Click {% octicon "kebab-horizontal" aria-label="The edit icon" %} next to the team discussion you want to edit or delete.
diff --git a/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
index bd05082110..6f1d1e1411 100644
--- a/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
+++ b/content/organizations/collaborating-with-your-team/pinning-a-team-discussion.md
@@ -13,8 +13,8 @@ topics:
   - Community
 ---
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-discussions-tab %}
 5. Click {% octicon "pin" aria-label="The pin icon" %} next to the team discussion you want to pin. You can also unpin a discussion by clicking the icon.
diff --git a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
index cf2612f5f2..6bce57518e 100644
--- a/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
+++ b/content/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization.md
@@ -26,8 +26,8 @@ You can view and revoke each member's linked identity, active sessions, and auth
 
 {% data reusables.identity-and-permissions.revoking-identity-team-sync %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.saml.click-person-revoke-identity %}
 {% data reusables.saml.saml-identity-linked %}
@@ -37,8 +37,8 @@ You can view and revoke each member's linked identity, active sessions, and auth
 
 ### Viewing and revoking an active SAML session
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.saml.click-person-revoke-session %}
 {% data reusables.saml.saml-identity-linked %}
@@ -49,8 +49,8 @@ You can view and revoke each member's linked identity, active sessions, and auth
 
 {% data reusables.saml.about-authorized-credentials %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.saml.click-person-revoke-credentials %}
 {% data reusables.saml.saml-identity-linked %}
diff --git a/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md
index bd833d6e83..d197b40d27 100644
--- a/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/requiring-two-factor-authentication-in-your-organization.md
@@ -57,8 +57,8 @@ To view people who were automatically removed from your organization for non-com
 
 ![Audit log event showing a user removed for 2FA non-compliance](/assets/images/help/2fa/2fa_noncompliance_audit_log_search.png)
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
 {% data reusables.audit_log.audit_log_sidebar_for_org_admins %}
 4. Enter your search query. To search for:
     - Organization members removed, use `action:org.remove_member` in your search query
diff --git a/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md
index 41b6f4bce2..dcc49c1a8e 100644
--- a/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md
+++ b/content/organizations/keeping-your-organization-secure/viewing-whether-users-in-your-organization-have-2fa-enabled.md
@@ -18,8 +18,8 @@ topics:
 
 {% endnote %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. To view organization members, including organization owners, who have enabled or disabled two-factor authentication, on the right, click **2FA**, and select **Enabled** or **Disabled**.
  ![filter-org-members-by-2fa](/assets/images/help/2fa/filter-org-members-by-2fa.png)
diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
index 374af47ef0..1fe95741a0 100644
--- a/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
+++ b/content/organizations/managing-access-to-your-organizations-project-boards/adding-an-outside-collaborator-to-a-project-board-in-your-organization.md
@@ -15,8 +15,8 @@ topics:
 
 An outside collaborator is a person who isn't explicitly a member of your organization, but who has permissions to a project board in your organization.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
index 93f29ee8e8..05b01de82a 100644
--- a/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
+++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-access-to-a-project-board-for-organization-members.md
@@ -23,8 +23,8 @@ By default, organization members have write access to their organization's proje
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
index f577adbb99..3897dfcb65 100644
--- a/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
+++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-an-individuals-access-to-an-organization-project-board.md
@@ -22,8 +22,8 @@ topics:
 
 ### Giving an organization member access to a project board
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
@@ -36,8 +36,8 @@ topics:
 
 ### Changing an organization member's access to a project board
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
@@ -49,8 +49,8 @@ topics:
 
 When you remove a collaborator from a project board, they may still retain access to the board based on the permissions they have for other roles. To completely remove access to a project board, you must remove access for each role the person has. For instance, a person may have access to the project board as an organization member or team member. For more information, see "[Project board permissions for an organization](/articles/project-board-permissions-for-an-organization)."
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
index af399ae944..f7281cf789 100644
--- a/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
+++ b/content/organizations/managing-access-to-your-organizations-project-boards/managing-team-access-to-an-organization-project-board.md
@@ -31,8 +31,8 @@ You can give an entire team the same permission level to a project board.
 
 {% endnote %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
@@ -47,8 +47,8 @@ You can give an entire team the same permission level to a project board.
 
 If a team's access to a project board is inherited from a parent team, you must change the parent team's access to the project board to update access to the child teams.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 4. Above the team's conversation, click {% octicon "project" aria-label="The Projects icon" %} **Projects**.
   ![The team repositories tab](/assets/images/help/organizations/team-project-board-button.png)
diff --git a/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
index 2fa71ab870..d50f5e6f84 100644
--- a/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
+++ b/content/organizations/managing-access-to-your-organizations-project-boards/removing-an-outside-collaborator-from-an-organization-project-board.md
@@ -13,8 +13,8 @@ topics:
   - Teams
 ---
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.organization-wide-project %}
 {% data reusables.project-management.select-project %}
 {% data reusables.project-management.click-menu %}
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
index cfe3bf6bfb..d58c1a61a4 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/canceling-an-invitation-to-become-an-outside-collaborator-in-your-organization.md
@@ -15,8 +15,8 @@ You can view a list of all people with pending invitations to become an outside
 
 For each pending collaborator, you can cancel all invitations to join organization repositories at the same time.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.people_tab_outside_collaborators %}
 5. Click **X pending collaborators**.
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
index 92a07a584b..8e21f9a086 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-organization-member-to-an-outside-collaborator.md
@@ -30,8 +30,8 @@ We recommend reviewing the organization member's access to repositories to ensur
 
 When you convert an organization member to an outside collaborator, their privileges as organization members are saved for three months so that you can restore their membership privileges if you{% if currentVersion == "free-pro-team@latest" %} invite them to rejoin{% else %} add them back to{% endif %} your organization within that time frame. For more information, see "[Reinstating a former member of your organization](/articles/reinstating-a-former-member-of-your-organization)."
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Select the person or people you'd like to convert to outside collaborators.
   ![List of members with two members selected](/assets/images/help/teams/list-of-members-selected-bulk.png)
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
index d0434fd9d3..e45de46cf2 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
@@ -20,8 +20,8 @@ If your organization is on a paid per-user subscription, an unused license must
 If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users {% if currentVersion == "free-pro-team@latest" %}you invite must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %}
 {% endif %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.people_tab_outside_collaborators %}
 {% if currentVersion == "free-pro-team@latest" %}
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
index dc26711621..9c32fb565b 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md
@@ -25,8 +25,8 @@ When you remove a collaborator from a repository in your organization, the colla
 
 ### Managing an individual's access to an organization repository
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Click either **Members** or **Outside collaborators** to manage people with different types of access. ![Button to invite members or outside collaborators to an organization](/assets/images/help/organizations/select-outside-collaborators.png)
 5. To the right of the name of the person you'd like to manage, use the {% octicon "gear" aria-label="The Settings gear" %} drop-down menu, and click **Manage**.
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
index 261be6fc45..ed90a174b4 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md
@@ -26,8 +26,8 @@ People with admin access to a repository can manage team access to the repositor
 
 ### Giving a team access to a repository
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-repositories-tab %}
 5. Above the list of repositories, click **Add repository**.
@@ -43,8 +43,8 @@ You can remove a team's access to a repository if the team has direct access to
 
 {% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team-repositories-tab %}
 5. Select the repository or repositories you'd like to remove from the team.
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
index 70ab62ba05..ab0f56ebc9 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
@@ -36,8 +36,8 @@ When you reinstate a former outside collaborator, you can restore:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.invite_member_from_people_tab %}
 {% data reusables.organizations.reinstate-user-type-username %}
diff --git a/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
index 1dacfdc072..5103411a2f 100644
--- a/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
+++ b/content/organizations/managing-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
@@ -30,8 +30,8 @@ While forks of private repositories are deleted when a collaborator is removed,
 
 ### Removing outside collaborators from all repositories in an organization
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.people_tab_outside_collaborators %}
 5. Select the outside collaborator or outside collaborators you'd like to remove from the organization.
@@ -45,8 +45,8 @@ While forks of private repositories are deleted when a collaborator is removed,
 
 If you only want to remove an outside collaborator from certain repositories in your organization, you can remove this person's access to one specific repository at a time.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.people_tab_outside_collaborators %}
 5. To the right of the username of the person you want to remove, use the {% octicon "gear" aria-label="The Settings gear" %} drop-down menu, and click **Manage**.
diff --git a/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
index a152a42a7a..92a901f825 100644
--- a/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/adding-people-to-your-organization.md
@@ -14,8 +14,8 @@ permissions: 'Organization owners can add people to an organization.'
 If your organization [requires members to use two-factor authentication](/articles/requiring-two-factor-authentication-in-your-organization), users must [enable two-factor authentication](/articles/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.
 {% endif %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.invite_member_from_people_tab %}
 {% data reusables.organizations.invite_to_org %}
diff --git a/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
index bf00b36312..db7571991b 100644
--- a/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/canceling-or-editing-an-invitation-to-join-your-organization.md
@@ -11,8 +11,8 @@ topics:
   - Teams
 ---
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. On the People tab, click **Pending invitation**.
  ![Pending invitation link](/assets/images/help/organizations/pending-invitation-link.png)
diff --git a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
index bda07badbd..326d40343a 100644
--- a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
@@ -21,8 +21,8 @@ topics:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.invite_member_from_people_tab %}
 {% data reusables.organizations.invite_to_org %}
diff --git a/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
index 1a9315bc5f..54169bbb8a 100644
--- a/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization.md
@@ -39,8 +39,8 @@ If your organization has a paid per-user subscription, an unused license must be
 
 ### Reinstating a former member of your organization
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 {% data reusables.organizations.invite_member_from_people_tab %}
 {% data reusables.organizations.reinstate-user-type-username %}
diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
index ebc15cbd0d..b20e4211b2 100644
--- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
@@ -48,8 +48,8 @@ To help the person you're removing from your organization transition and help en
 
 ### Revoking the user's membership
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Select the member or members you'd like to remove from the organization.
   ![List of members with two members selected](/assets/images/help/teams/list-of-members-selected-bulk.png)
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md
index 12be9456e2..4a7e911bcd 100644
--- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md
+++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/giving-team-maintainer-permissions-to-an-organization-member.md
@@ -20,8 +20,8 @@ topics:
 
 Before promoting an organization member to team maintainer, the person must already be a member of the team.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_members_tab %}
 4. Select the person or people you'd like to promote to team maintainer.
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
index 2f4cc1f935..370eda378e 100644
--- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
+++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization.md
@@ -31,8 +31,8 @@ Organization owners have full administrative access to the organization. {% data
 
 ### Appointing an organization owner
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.people %}
 4. Select the person or people you'd like to promote to owner.
   ![List of members with two members selected](/assets/images/help/teams/list-of-members-selected-bulk.png)
diff --git a/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
index 4436f70e90..3085f8a435 100644
--- a/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
+++ b/content/organizations/migrating-to-improved-organization-permissions/converting-an-owners-team-to-improved-organization-permissions.md
@@ -27,8 +27,8 @@ You have a few options to convert your legacy Owners team:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.owners-team %}
 {% data reusables.organizations.convert-owners-team-confirm %}
 5. In the team name field, choose a new name for the Owners team. For example:
@@ -47,8 +47,8 @@ You have a few options to convert your legacy Owners team:
 
 {% endwarning %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.owners-team %}
 {% data reusables.organizations.convert-owners-team-confirm %}
 5. At the bottom of the page, review the warning and click **Delete the Owners team**.
diff --git a/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
index 81a04e40a1..c95a091652 100644
--- a/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
+++ b/content/organizations/migrating-to-improved-organization-permissions/migrating-admin-teams-to-improved-organization-permissions.md
@@ -39,8 +39,8 @@ For more information, see "[Repository permission levels for an organization](/a
 
 ### Migrating a single admin team
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 1. In the team description box, click **Migrate team**.
   ![Migrate team button](/assets/images/help/teams/migrate-a-legacy-admin-team.png)
diff --git a/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
index 9a4383b880..664f505d92 100644
--- a/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
+++ b/content/organizations/organizing-members-into-teams/adding-organization-members-to-a-team.md
@@ -16,8 +16,8 @@ topics:
 
 {% data reusables.organizations.team-synchronization %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_members_tab %}
 6. Above the list of team members, click **Add a member**.
diff --git a/content/organizations/organizing-members-into-teams/changing-team-visibility.md b/content/organizations/organizing-members-into-teams/changing-team-visibility.md
index 9195488d0c..45937e1e15 100644
--- a/content/organizations/organizing-members-into-teams/changing-team-visibility.md
+++ b/content/organizations/organizing-members-into-teams/changing-team-visibility.md
@@ -21,8 +21,8 @@ topics:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.teams %}
 3. Select the team or teams whose visibility you'd like to change.
   ![List of teams with two teams selected](/assets/images/help/teams/list-of-teams-selected.png)
diff --git a/content/organizations/organizing-members-into-teams/creating-a-team.md b/content/organizations/organizing-members-into-teams/creating-a-team.md
index d56b4931eb..ccc8a80df4 100644
--- a/content/organizations/organizing-members-into-teams/creating-a-team.md
+++ b/content/organizations/organizing-members-into-teams/creating-a-team.md
@@ -18,8 +18,8 @@ Only organization owners and maintainers of a parent team can create a new child
 
 {% data reusables.organizations.team-synchronization %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.new_team %}
 {% data reusables.organizations.team_name %}
 {% data reusables.organizations.team_description %}
diff --git a/content/organizations/organizing-members-into-teams/deleting-a-team.md b/content/organizations/organizing-members-into-teams/deleting-a-team.md
index c350affca2..a42ba28d65 100644
--- a/content/organizations/organizing-members-into-teams/deleting-a-team.md
+++ b/content/organizations/organizing-members-into-teams/deleting-a-team.md
@@ -19,8 +19,8 @@ topics:
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.teams %}
 4. Select the team or teams you'd like to delete.
   ![List of teams with two teams selected](/assets/images/help/teams/list-of-teams-selected.png)
diff --git a/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md
index bd416d6709..465a01b10a 100644
--- a/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md
+++ b/content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md
@@ -30,8 +30,8 @@ The round robin algorithm chooses reviewers based on who's received the least re
 The load balance algorithm chooses reviewers based on each member's total number of recent review requests and considers the number of outstanding reviews for each member. The load balance algorithm tries to ensure that each team member reviews an equal number of pull requests in any 30 day period.
 
 ### Configuring code review assignment
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 5. In the left sidebar, click **Code review assignment**
@@ -49,8 +49,8 @@ The load balance algorithm chooses reviewers based on each member's total number
 11. Click **Save changes**.
 
 ### Disabling code review assignment
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 5. Select **Enable auto assignment** to remove the checkmark.
diff --git a/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
index dafc9c885f..c617b92efd 100644
--- a/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
+++ b/content/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team.md
@@ -20,8 +20,8 @@ Team maintainers and organization owners can set scheduled reminders for any pul
 {% data reusables.reminders.scheduled-reminders-limitations %}
 
 ### Creating a scheduled reminder for a team
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 {% data reusables.reminders.scheduled-reminders %}
@@ -44,8 +44,8 @@ Team maintainers and organization owners can set scheduled reminders for any pul
 {% data reusables.reminders.create-reminder %}
 
 ### Managing a scheduled reminder for a team
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 {% data reusables.reminders.scheduled-reminders %}
@@ -55,8 +55,8 @@ Team maintainers and organization owners can set scheduled reminders for any pul
 {% data reusables.reminders.update-buttons %}
 
 ### Deleting a scheduled reminder for a team
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 {% data reusables.reminders.scheduled-reminders %}
diff --git a/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
index 89bd928eb5..b3f025e361 100644
--- a/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
+++ b/content/organizations/organizing-members-into-teams/moving-a-team-in-your-organizations-hierarchy.md
@@ -27,8 +27,8 @@ Organization owners can change the parent of any team. Team maintainers can chan
 
 {% endtip %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.teams %}
 4. In the list of teams, click the name of the team whose parent you'd like to change.
   ![List of the organization's teams](/assets/images/help/teams/click-team-name.png)
diff --git a/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
index 2678eecab0..d94afb6085 100644
--- a/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
+++ b/content/organizations/organizing-members-into-teams/removing-organization-members-from-a-team.md
@@ -16,8 +16,8 @@ topics:
 
 {% data reusables.repositories.deleted_forks_from_private_repositories_warning %}  
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 4. Select the person or people you'd like to remove.
   ![Check box next to organization member](/assets/images/help/teams/team-member-check-box.png)
diff --git a/content/organizations/organizing-members-into-teams/renaming-a-team.md b/content/organizations/organizing-members-into-teams/renaming-a-team.md
index 42dd5a0df9..66703afcf7 100644
--- a/content/organizations/organizing-members-into-teams/renaming-a-team.md
+++ b/content/organizations/organizing-members-into-teams/renaming-a-team.md
@@ -13,8 +13,8 @@ topics:
   - Teams
 ---
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 5. Type a new name or description for the team.
diff --git a/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
index 76e8921f35..a8c8d4281c 100644
--- a/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
+++ b/content/organizations/organizing-members-into-teams/requesting-to-add-a-child-team.md
@@ -19,8 +19,8 @@ If you're an organization owner or you have team maintainer permissions in both
 
 {% data reusables.organizations.child-team-inherits-permissions %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.teams %}
 4. In the list of teams, click the name of the team where you'd like to add the child team.
   ![List of the organization's teams](/assets/images/help/teams/click-team-name.png)
diff --git a/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
index 4d137daa48..3df0c2bfdc 100644
--- a/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
+++ b/content/organizations/organizing-members-into-teams/requesting-to-add-or-change-a-parent-team.md
@@ -19,8 +19,8 @@ If you're an organization owner or you have team maintainer permissions in the c
 
 {% data reusables.organizations.child-team-inherits-permissions %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.teams %}
 4. In the list of teams, click the name of the team you'd like to nest under a parent.
   ![List of the organization's teams](/assets/images/help/teams/click-team-name.png)
diff --git a/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
index 0fcfd4c6be..35e17aceb8 100644
--- a/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
+++ b/content/organizations/organizing-members-into-teams/setting-your-teams-profile-picture.md
@@ -15,8 +15,8 @@ topics:
 ---
 Unless you set a profile picture for a team, the team profile picture will match the organization's profile picture.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 5. Click **Upload new picture** and select your desired profile picture.
diff --git a/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
index ffb2335f61..2251f1b137 100644
--- a/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
+++ b/content/organizations/organizing-members-into-teams/synchronizing-a-team-with-an-identity-provider-group.md
@@ -77,8 +77,8 @@ Once user provisioning for {% data variables.product.product_name %} is configur
 
 When you connect an IdP group to a {% data variables.product.product_name %} team, all users in the group are automatically added to the team. {% if currentVersion == "github-ae@latest" %}Any users who were not already members of the parent organization members are also added to the organization.{% endif %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 {% if currentVersion == "free-pro-team@latest" %}
@@ -92,8 +92,8 @@ When you connect an IdP group to a {% data variables.product.product_name %} tea
 
 If you disconnect an IdP group from a {% data variables.product.prodname_dotcom %} team, team members that were assigned to the {% data variables.product.prodname_dotcom %} team through the IdP group will be removed from the team. {% if currentVersion == "github-ae@latest" %} Any users who were members of the parent organization only because of that team connection are also removed from the organization.{% endif %}
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 {% data reusables.organizations.specific_team %}
 {% data reusables.organizations.team_settings %}
 {% if currentVersion == "free-pro-team@latest" %}
diff --git a/content/packages/learn-github-packages/viewing-packages.md b/content/packages/learn-github-packages/viewing-packages.md
index 24b0e6bdc2..4f6987c9ac 100644
--- a/content/packages/learn-github-packages/viewing-packages.md
+++ b/content/packages/learn-github-packages/viewing-packages.md
@@ -38,8 +38,8 @@ You can find and view a package located in a particular repository.
 
 You can find and view a package located in the repositories of an organization you belong to.
 
-{% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
+{% data reusables.user_settings.access_org %}
 3. Under your organization name, click {% octicon "package" aria-label="The package icon" %} **Packages**.
 {% data reusables.package_registry.navigate-to-packages %}
 
diff --git a/data/reusables/profile/access_org.md b/data/reusables/profile/access_org.md
index ee8ec12553..25ef56842e 100644
--- a/data/reusables/profile/access_org.md
+++ b/data/reusables/profile/access_org.md
@@ -1,2 +1,5 @@
-1. In the top right corner of {% data variables.product.prodname_dotcom %}, click your profile photo, then click **Your organizations**.
-  ![Your organizations in the profile menu](/assets/images/help/profile/your-organizations.png)
\ No newline at end of file
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %}1. In the top right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your organizations**.
+  ![Your organizations in the profile menu](/assets/images/help/profile/your-organizations.png){% else %}1. In the top right corner of {% data variables.product.product_name %}, click your profile photo, then click **Your profile**.
+  ![Profile photo](/assets/images/enterprise/settings/top_right_avatar.png)
+ 2. On the left side of your profile page, under "Organizations", click the icon for your organization.
+ ![organization icons](/assets/images/help/profile/profile_orgs_box.png){% endif %}
\ No newline at end of file
diff --git a/data/reusables/profile/org_settings.md b/data/reusables/profile/org_settings.md
index 9adfd284bc..4954721a01 100644
--- a/data/reusables/profile/org_settings.md
+++ b/data/reusables/profile/org_settings.md
@@ -1,2 +1,3 @@
-2. Click **Settings** next to the organization.
-  ![The settings button](/assets/images/help/organizations/settings-button.png)
\ No newline at end of file
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %}2. Click **Settings** next to the organization.
+  ![The settings button](/assets/images/help/organizations/settings-button.png){% else %}2. Under your organization name, click {% octicon "gear" aria-label="The Settings gear icon" %} **Settings**.
+  ![The settings button](/assets/images/help/organizations/organization-settings-tab.png){% endif %}
\ No newline at end of file
diff --git a/data/reusables/user_settings/access_org.md b/data/reusables/user_settings/access_org.md
new file mode 100644
index 0000000000..8120279aad
--- /dev/null
+++ b/data/reusables/user_settings/access_org.md
@@ -0,0 +1,2 @@
+{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %}2. Click the name of your organization.
+  ![Organization name in list of organizations](/assets/images/help/organizations/org-settings-link.png){% endif %}
\ No newline at end of file
diff --git a/lib/enterprise-dates.json b/lib/enterprise-dates.json
index 19010dba09..db5cad8a34 100644
--- a/lib/enterprise-dates.json
+++ b/lib/enterprise-dates.json
@@ -100,7 +100,11 @@
     "deprecationDate": "2022-06-01"
   },
   "3.2": {
-    "releaseDate": "2021-07-06",
-    "deprecationDate": "2022-08-03"
+    "releaseDate": "2021-07-27",
+    "deprecationDate": "2022-08-24"
+  },
+  "3.3": {
+    "releaseDate": "2021-11-09",
+    "deprecationDate": "2022-12-07"
   }
 }
\ No newline at end of file