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,6 +1,9 @@
 ---
 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]

cloud-account/index.md

@@ -2,17 +2,27 @@
 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
 
-% 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.
+
+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 so that you can restore them to your new organization. <-- we could add a link to https://www.elastic.co/guide/en/cloud/current/ec-custom-repository.html when the page gets migrated -->
+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,6 +1,9 @@
 ---
 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]

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

@@ -1,18 +1,21 @@
 ---
 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:
 
-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:
 
 1. Go to the [Forgot password](https://cloud.elastic.co/forgot) page and enter your email address.

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,13 +90,15 @@ $$$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.
 

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