diff --git a/content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md b/content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md index f84cea8792..f5658890f2 100644 --- a/content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md +++ b/content/admin/data-residency/getting-started-with-data-residency-for-github-enterprise-cloud.md @@ -45,7 +45,12 @@ After we create your enterprise, you will receive an email inviting you to choos Using an **incognito or private browsing window**: 1. Set the user's password. -1. Save the user's recovery codes. +1. Enable two-factor authentication (2FA), and save the user's recovery codes. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication). + + > [!NOTE] + > If 2FA isn't enabled, you will need to enter your enterprise's single sign-on (SSO) recovery code each time you sign in as the setup user. You can download these codes once SSO is enabled. + +{% data reusables.enterprise-accounts.emu-recommend-password-manager %} {% data reusables.enterprise-accounts.emu-password-reset-session %} diff --git a/content/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users.md b/content/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users.md index 782dcf6afa..e5568357ef 100644 --- a/content/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users.md +++ b/content/admin/managing-iam/understanding-iam-for-enterprises/getting-started-with-enterprise-managed-users.md @@ -37,12 +37,14 @@ After we create your enterprise, you will receive an email inviting you to choos Using an **incognito or private browsing window**: 1. Set the user's password. -1. Save the user's recovery codes. -1. Enable two-factor authentication. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication). +1. Enable two-factor authentication (2FA), and save the enterprise recovery codes. See [AUTOTITLE](/admin/managing-iam/managing-recovery-codes-for-your-enterprise/downloading-your-enterprise-accounts-single-sign-on-recovery-codes#downloading-codes-for-an-enterprise-with-enterprise-managed-users). + + > [!WARNING] + > All subsequent login attempts for the setup user account will require a successful 2FA challenge response or the use of an enterprise recovery code to complete authentication. To avoid being locked out of your account, save your enterprise recovery codes. {% data reusables.enterprise-accounts.emu-password-reset-session %} -We strongly recommend **storing the credentials for the setup user** in your company's password management tool. Someone will need to sign in as this user to update authentication settings, migrate to another identity provider or authentication method, or use your enterprise's recovery codes. +{% data reusables.enterprise-accounts.emu-recommend-password-manager %} ## Create a {% data variables.product.pat_generic %} diff --git a/data/reusables/enterprise-accounts/emu-recommend-password-manager.md b/data/reusables/enterprise-accounts/emu-recommend-password-manager.md new file mode 100644 index 0000000000..381eb7306f --- /dev/null +++ b/data/reusables/enterprise-accounts/emu-recommend-password-manager.md @@ -0,0 +1 @@ +We strongly recommend **storing the credentials for the setup user** in your company's password management tool. Someone will need to sign in as this user to update authentication settings, migrate to another identity provider or authentication method, or use your enterprise's recovery codes.