cloud account refinement

cloud-account/add-a-login-method.md

@@ -1,6 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-change-login-method.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Add a login method [ec-change-login-method]
@@ -19,8 +22,7 @@ To enable password-based login in addition to Google or Microsoft sign-in, go to
 
 After you create a password, log in. You’ll be prompted to [enable multifactor authentication](multifactor-authentication.md).
 
-You will now be able to change the email address in your [user settings](https://cloud.elastic.co/user/settings).
-
+You will now be able to change the email address in your [user settings](https://cloud.elastic.co/user/settings). Refer to [Update your email address](/cloud-account/update-your-email-address.md) for more information.
 
 ## Enable Google or Microsoft sign-in [ec_enable_google_or_microsoft_sign_in]
 

cloud-account/change-your-password.md

@@ -1,26 +1,29 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-change-password.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Change your password [ec-change-password]
 
-If you created a password when you signed up for a Elasticsearch Service account, or you added the password-based login method to your account, then you can change your password if needed.
+If you created a password when you signed up for a {{ecloud}} account, or you added the password-based login method to your account, then you can change your password if needed.
 
 If you know your current password:
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Open the user menu in the header bar.
 3. Go to **Profile**.
 4. Select **Change password**.
 5. Enter the current password and provide the new password that you want to use.
 
 If you don’t know your current password:
 
-1. At the login screen for the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body), select the link **Forgot password?**.
+1. At the login screen for the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body), select the link **Forgot password?**.
 2. Enter the primary email address for your account and select **Reset password**.
 
-    By default, to sign up for Elasticsearch Service you use your primary email address. If you change it at some point, use your current email address to log in to Elasticsearch Service.
+    By default, to sign up for {{ecloud}} you use your primary email address. If you change it at some point, use your current email address to log in to {{ecloud}}.
 
     An email is sent to the address you specified with a link to reset the password. If you don’t get the email after a few minutes, check your spam folder.
 

cloud-account/index.md

@@ -2,17 +2,29 @@
 mapped_urls:
   - https://www.elastic.co/guide/en/cloud/current/ec-account-user-settings.html
   - https://www.elastic.co/guide/en/serverless/current/general-user-profile.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
-# Cloud account
+# Manage your Cloud account
 
-% What needs to be done: Refine
+Your {{ecloud}} account allows you to manage your personal settings, including your email address, password, and authentication methods. You can perform the following tasks at any time from your user profile:
 
-% GitHub issue: https://github.com/elastic/docs-projects/issues/304
+* [Update your email address](/cloud-account/update-your-email-address.md)
+* [Add an additional login method](/cloud-account/add-a-login-method.md): Choose from password-based login, Google sign-in, and Microsoft sign-in.
 
-% Scope notes: https://github.com/elastic/docs-projects/issues/304
+If you use password-based login, then you can perform the following additional tasks:
 
-% Use migrated content from existing pages that map to this page:
+* [Change your password](/cloud-account/change-your-password.md)
+* [Configure multifactor authentication](/cloud-account/multifactor-authentication.md)
 
-% - [ ] ./raw-migrated-files/cloud/cloud/ec-account-user-settings.md
-% - [ ] ./raw-migrated-files/docs-content/serverless/general-user-profile.md
+Additionally, you can manage your organization membership, including joining or leaving an organization. Refer to [Join or leave an organization](/cloud-account/join-or-leave-an-organization.md) for more information.
+
+::::{tip} 
+This section focuses on the actions you can take as an individual user to manage your own account. It does not cover organization-wide settings, such as managing user permissions or configuring organization-level access controls, which are handled by the organization administrators.
+
+For information on organization and access management, refer to:
+- [Manage your Cloud organization](/deploy-manage/cloud-organization.md)
+- [Manage user roles and permissions](/deploy-manage/users-roles/cloud-organization/user-roles.md)
+::::

cloud-account/join-or-leave-an-organization.md

@@ -2,15 +2,41 @@
 mapped_urls:
   - https://www.elastic.co/guide/en/cloud/current/ec-invite-users.html
   - https://www.elastic.co/guide/en/serverless/current/general-manage-organization.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Join or leave an organization
 
-% What needs to be done: Refine
+Organizations in {{ecloud}} group user accounts, projects and deployments under a common billing and access structure. If you have been invited to an organization, you can accept the invitation and become a member. You can also leave an organization at any time, as long as you don’t have active projects or deployments associated with your account.
 
-% Scope notes: https://github.com/elastic/docs-projects/issues/304
+This guide explains how to join or leave an organization, including steps for handling projects and deployments when switching organizations.
 
-% Use migrated content from existing pages that map to this page:
+## Accept an invitation [ec-accept-invitation]
 
-% - [ ] ./raw-migrated-files/cloud/cloud/ec-invite-users.md
-% - [ ] ./raw-migrated-files/docs-content/serverless/general-manage-organization.md
+Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation. If they do not join within that period, an administrator of the organization will have to send a new invitation. Refer to [manage users](/deploy-manage/users-roles/cloud-organization/manage-users.md) for more information.
+
+## Leave an organization [ec-leave-organization]
+
+On the **Members** tab of the **Organization** page, click the three dots corresponding to your email address and select **Leave organization**.
+
+If you’re the only user in the organization, you can only leave if you deleted all your deployments and projects, and you don’t have pending bills.
+
+## Join an organization from an existing {{ecloud}} account [ec-join-invitation]
+
+If you already belong to an organization, and you want to join a new one you will need to leave your existing organization and follow this steps:
+
+1. Make sure you do not have active projects or deployments before you leave your current organization.
+2. Delete your projects or deployments and clear any bills.
+3. Leave your current organization.
+4. Ask the administrator to invite you to the organization you want to join.
+5. Accept the invitation that you will get by email.
+
+Alternatively, for Elastic Cloud Hosted deployments, there's a possibility to migrate your deployments to the new organization through back up and restore operations. In such case:
+
+1. [Back up your deployments to any private repository](/deploy-manage/tools/snapshot-and-restore/ec-custom-repository.md) so that you can restore them to your new organization. 
+2. Leave your current organization.
+3. Ask the administrator to invite you to the organization you want to join.
+4. Accept the invitation that you will get by email.
+5. Configure the private repository in your new organization and restore the backup you took in step 1.

cloud-account/multifactor-authentication.md

@@ -1,11 +1,14 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-account-security-mfa.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Multifactor authentication [ec-account-security-mfa]
 
-If you use a password-based login, Elastic requires that you add an extra layer of security to your Elasticsearch Service account by enabling a multifactor authentication (MFA) method.
+If you use a password-based login, Elastic requires you to enable multifactor authentication (MFA) for added security on your {{ecloud}} account.
 
 You can choose from the following methods:
 
@@ -15,7 +18,7 @@ You can choose from the following methods:
 
 Elastic recommends that you enable multiple methods so that you can still access your account if you lose access to one method.
 
-If you use only a Google or Microsoft account to log in, then you can’t configure MFA in Elasticsearch Service. You can check and manage your multifactor authentication options in your Google or Microsoft account security settings.
+If you use only a Google or Microsoft account to log in, then you can’t configure MFA in {{ecloud}}. You can check and manage your multifactor authentication options in your Google or Microsoft account security settings.
 
 ::::{note} 
 You can no longer configure SMS as a multifactor authentication method. If you already use SMS for multifactor authentication, then you can continue using it. You’ll be prompted to switch to a new MFA method in the future.
@@ -27,7 +30,7 @@ You can no longer configure SMS as a multifactor authentication method. If you a
 
 To enable multifactor authentication using an authenticator app, you must enroll your device.
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Go to [User settings](https://cloud.elastic.co/user/settings) and choose **Profile**. Navigate to the **Multifactor authentication** section.
 3. On the **Authenticator app** card, select **Set up**.
 4. Scan the QR code with your authenticator app. If you can’t scan the QR code, then you can enter the code manually.
@@ -38,7 +41,7 @@ To enable multifactor authentication using an authenticator app, you must enroll
 
 To enable multifactor authentication using a security key or biometrics, you must register your security key or biometric data.
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Go to [User settings](https://cloud.elastic.co/user/settings) and choose **Profile**. Navigate to the **Multifactor authentication** section.
 3. On the **Security key or biometrics** card, select **Set up**.
 4. Follow the prompts on your screen to register your hardware security key or your biometric authentication method.
@@ -48,7 +51,7 @@ To enable multifactor authentication using a security key or biometrics, you mus
 
 To enable multifactor authentication using an authenticator app, you must verify your email address.
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Go to [User settings](https://cloud.elastic.co/user/settings) and choose **Profile**. Navigate to the **Multifactor authentication** section.
 3. On the **Email** card, select **Set up**.
 4. Enter the verification code sent to your email address, and then select **Enable authentication method**.
@@ -105,12 +108,9 @@ You can explore the following workarounds:
 * Use the email MFA method, assuming all of your team members have access to the generic account or distribution list’s mailbox.
 * Keep using the generic account to log in and set up multifactor authentication [using an authenticator app](#ec-account-security-mfa-authenticator).
 
-    ```
-    During the setup, take a photo of the QR code, or note its numeric version, and share it across your team. This code is sensitive and should be stored and shared securely. For example, it should be stored in an encrypted place using a secure algorithm such as AES-256, and transmitted over a secure encrypted channel such as TLS 1.3.
-    ```
-    ```
-    This QR code is the "base" number used by the Authenticator app to generate codes based on the current time. There is no danger of synchronization issues. However, there is risk of a breach if the QR code picture or number is compromised.
-    ```
+  During the setup, take a photo of the QR code, or note its numeric version, and share it across your team. This code is sensitive and should be stored and shared securely. For example, it should be stored in an encrypted place using a secure algorithm such as AES-256, and transmitted over a secure encrypted channel such as TLS 1.3.
+
+  This QR code is the "base" number used by the Authenticator app to generate codes based on the current time. There is no danger of synchronization issues. However, there is risk of a breach if the QR code picture or number is compromised.
 
 
 **After I set up an MFA method, will I need to answer an MFA challenge every time I authenticate through Elastic Cloud?**

cloud-account/update-your-email-address.md

@@ -1,23 +1,26 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-update-email-address.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Update your email address [ec-update-email-address]
 
-Each Elasticsearch Service account has a primary email associated with it. By default, the primary email address is used to sign up for Elasticsearch Service and to log in. If needed, you can change this primary email address:
+Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address:
 
-1. By **Email address**, select **edit**.
-2. Enter a new email address and your current password.
+1. To edit your account settings, select the user icon on the header bar and select **Settings**.
+2. In the **Email address** section, select **edit**.
+3. Enter a new email address and your current password.
 
     An email is sent to the new address with a link to confirm the change. If you don’t get the email after a few minutes, check your spam folder.
 
-
-If you are using Google or Microsoft Sign-In and would like to change your email address, you will need to:
+If you are using Google or Microsoft Sign-In and would like to change your email address, you need to:
 
 1. Go to the [Forgot password](https://cloud.elastic.co/forgot) page and enter your email address.
 2. Follow the instructions in the "Reset your password" email.
-3. In the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body), update your [User settings](https://cloud.elastic.co/user/settings) to the new email address.
+3. In the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body), update your [User settings](https://cloud.elastic.co/user/settings) to the new email address.
 
 If your organization is associated with [Azure Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to your organization.
 

raw-migrated-files/cloud/cloud/ec-invite-users.md

@@ -26,11 +26,13 @@ To edit a member’s roles, in the **Actions** column click the three dots and s
 
 
 ## Accept an invitation [ec-accept-invitation]
+% This section has been already added by @eedugon to the cloud-account section)
 
 Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation. If they do not join within that period, you will have to send a new invitation.
 
 
 ## Join an organization from an existing {{ecloud}} account [ec-join-invitation]
+% This section has been already added by @eedugon to the cloud-account section)
 
 You already belong to an organization. If you want to join a new one and bring your deployments over, follow these steps:
 
@@ -50,6 +52,7 @@ If you want to join a new one, but leave your deployments, follow these steps:
 
 
 ## Leave an organization [ec-leave-organization]
+% This section has been already added by @eedugon to the cloud-account section)
 
 On the **Members** tab of the **Organization** page, click the three dots corresponding to your email address and select **Leave organization**.
 

raw-migrated-files/docs-content/serverless/general-manage-organization.md

@@ -90,15 +90,17 @@ $$$general-assign-user-roles-table$$$
 
 
 ## Leave an organization [general-leave-an-organization]
+% This section has been already added by @eedugon to the cloud-account section)
 
 On the **Organization** page, click **Leave organization**.
 
 If you’re the only user in the organization, you are able to leave only when you have deleted all projects and don’t have any pending bills.
 
 
 ## Join an organization from an existing Elastic Cloud account [general-join-organization-from-existing-cloud-account]
+% This section has been already added by @eedugon to the cloud-account section)
 
-If you already belong to an organization, and you want to join a new one you will need to leave your existing organzation.
+If you already belong to an organization, and you want to join a new one you will need to leave your existing organization.
 
 If you want to join a new organization, follow these steps:
 

raw-migrated-files/toc.yml

@@ -169,7 +169,6 @@ toc:
       - file: cloud/cloud/ec-about.md
       - file: cloud/cloud/ec-access-kibana.md
       - file: cloud/cloud/ec-account-usage.md
-      - file: cloud/cloud/ec-account-user-settings.md
       - file: cloud/cloud/ec-activity-page.md
       - file: cloud/cloud/ec-add-user-settings.md
       - file: cloud/cloud/ec-api-deployment-other.md
@@ -295,7 +294,6 @@ toc:
       - file: docs-content/serverless/general-monitor-usage.md
       - file: docs-content/serverless/general-serverless-status.md
       - file: docs-content/serverless/general-sign-up-trial.md
-      - file: docs-content/serverless/general-user-profile.md
       - file: docs-content/serverless/incident-management.md
       - file: docs-content/serverless/index-management.md
       - file: docs-content/serverless/infrastructure-and-host-monitoring-intro.md