diff --git a/REDIRECTS b/REDIRECTS
index 5b39057f..ca57faee 100644
--- a/REDIRECTS
+++ b/REDIRECTS
@@ -121,7 +121,7 @@ https://merginmaps.com/docs/field/input_features/	https://merginmaps.com/docs/fi
 https://merginmaps.com/docs/field/input_ui/	https://merginmaps.com/docs/field/mobile-app-ui/
 https://merginmaps.com/docs/gis/enable_browsing/	https://merginmaps.com/docs/gis/search_data/
 https://merginmaps.com/docs/howto/attach-multiple-photos-to-features/	https://merginmaps.com/docs/layer/attach-multiple-photos-to-features/
-https://merginmaps.com/docs/howto/contribute/	https://merginmaps.com/docs/misc/contribute/
+https://merginmaps.com/docs/howto/contribute/	https://merginmaps.com/docs/misc/get-involved/
 https://merginmaps.com/docs/howto/create-an-organization/	https://merginmaps.com/docs/manage/workspaces/
 https://merginmaps.com/docs/howto/create-project/	https://merginmaps.com/docs/manage/create-project/
 https://merginmaps.com/docs/howto/customapp/	https://merginmaps.com/docs/dev/customapp/
@@ -178,6 +178,7 @@ https://merginmaps.com/docs/manage/project-details/	https://merginmaps.com/docs/
 https://merginmaps.com/docs/manage/plugin-multi-server-use/	https://merginmaps.com/docs/server/plugin-mobile-app/
 https://merginmaps.com/docs/manage/plugin-sync-project/	https://merginmaps.com/docs/manage/plugin/
 https://merginmaps.com/docs/misc/privacy/	N/A -- handled by https://merginmaps.com/privacy-policy/
+https://merginmaps.com/docs/misc/contribute/	https://merginmaps.com/docs/misc/get-involved/
 https://merginmaps.com/docs/reference/licensing/	https://merginmaps.com/docs/misc/licensing/
 https://merginmaps.com/docs/reference/privacy/	N/A -- handled by https://merginmaps.com/privacy-policy/
 https://merginmaps.com/docs/server/administer/environment/	https://merginmaps.com/docs/server/environment/
@@ -189,7 +190,7 @@ https://merginmaps.com/docs/setup/working-with-organisations/	https://merginmaps
 https://merginmaps.com/docs/components/mobile/	https://merginmaps.com/docs/
 https://www.merginmaps.com/docs/components/web/	https://merginmaps.com/docs/
 https://www.merginmaps.com/docs/concepts/	https://merginmaps.com/docs/
-https://www.merginmaps.com/docs/contribute/	https://merginmaps.com/docs/misc/contribute/
+https://www.merginmaps.com/docs/contribute/	https://merginmaps.com/docs/misc/get-involved/
 https://merginmaps.com/docs/faq/	https://merginmaps.com/docs/
 https://www.merginmaps.com/docs/guides/datum-shift/	https://merginmaps.com/docs/gis/proj/
 https://www.merginmaps.com/docs/guides/mergin-tour/	https://merginmaps.com/docs/
diff --git a/src/.vitepress/components/CommunityPlatformNameLink.vue b/src/.vitepress/components/CommunityPlatformNameLink.vue
index f0ac23f3..ee0de256 100644
--- a/src/.vitepress/components/CommunityPlatformNameLink.vue
+++ b/src/.vitepress/components/CommunityPlatformNameLink.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :href="`https://merginmaps.com/pricing-for-ce-and-ee`" target="_blank" class="nospellcheck">
+  <a :href="`https://github.com/MerginMaps`" target="_blank" class="nospellcheck">
     <span v-if="desc" v-html="desc"></span>
     <span v-else class="nospellcheck">Mergin Maps CE</span>
   </a>
diff --git a/src/.vitepress/components/EnterprisePlatformNameLink.vue b/src/.vitepress/components/EnterprisePlatformNameLink.vue
index cd95d667..468367d4 100644
--- a/src/.vitepress/components/EnterprisePlatformNameLink.vue
+++ b/src/.vitepress/components/EnterprisePlatformNameLink.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :href="`https://merginmaps.com/pricing-for-ce-and-ee`" target="_blank" class="nospellcheck">
+  <a :href="`https://merginmaps.com/pricing`" target="_blank" class="nospellcheck">
     <span v-if="desc" v-html="desc"></span>
     <span v-else class="nospellcheck">Mergin Maps EE</span>
   </a>
diff --git a/src/.vitepress/components/ServerCloudNameLink.vue b/src/.vitepress/components/ServerCloudNameLink.vue
new file mode 100644
index 00000000..4980275b
--- /dev/null
+++ b/src/.vitepress/components/ServerCloudNameLink.vue
@@ -0,0 +1,19 @@
+<template>
+  <a :href="`https://merginmaps.com/${id}`" target="_blank" class="nospellcheck">
+    <span v-if="desc" v-html="desc"></span>
+    <span v-else class="nospellcheck">Mergin Maps Cloud</span>
+  </a>
+</template>
+
+<script>
+export default {
+  name: "server-cloud-name-link",
+  props: {
+    id: {
+      type: String,
+      default: ''
+    },
+    desc: String
+  }
+}
+</script>
diff --git a/src/.vitepress/sidebar/en.js b/src/.vitepress/sidebar/en.js
index 2a770043..d5e7c388 100644
--- a/src/.vitepress/sidebar/en.js
+++ b/src/.vitepress/sidebar/en.js
@@ -27,6 +27,7 @@ export default {
       collapsed: true,
       items: [
         { text: 'User Account', link: '/manage/account/' },
+        { text: 'Single Sign-On (SSO)', link: '/manage/sso/' },
         { text: 'Workspaces', link: '/manage/workspaces/' },
         { text: 'Subscriptions and Invoicing', link: '/manage/subscriptions/' },
         { text: 'Member Roles and Permissions', link: '/manage/permissions/' },
@@ -138,8 +139,8 @@ export default {
       collapsed: true,
       items: [
         { text: 'Licensing', link: '/misc/licensing/' },
+        { text: 'Get Involved', link: '/misc/get-involved/' },
         { text: 'Troubleshoot', link: '/misc/troubleshoot/' },
-        { text: 'Contribute', link: '/misc/contribute/' },
         { text: 'Write Documentation', link: '/misc/write-docs/' }
       ]
     }
diff --git a/src/field/tracking/index.md b/src/field/tracking/index.md
index eb3b4f08..4a838fce 100644
--- a/src/field/tracking/index.md
+++ b/src/field/tracking/index.md
@@ -30,7 +30,7 @@ Enabled tracking means that a new line layer for tracking will be created in you
 | `tracking_start_time`    | DateTime       | `@tracking_start_time` | Date and time when tracking started  |
 | `tracking_end_time`      | DateTime       | `@tracking_end_time`   | Date and time when tracking ended    |
 | `total_distance`         | Real           | `$length`              | Tracked distance |
-| `tracked_by`             | String         | `@mergin_username`     | Name of the current <MainPlatformNameLink /> user |
+| `tracked_by`             | String         | `@mm_username`     | Name of the current <MainPlatformNameLink /> user |
 
 You can add new fields as needed, however, they should be set up with automatically generated [default values](../../layer/form-configuration/#default-values) as <MobileAppName /> will not open the form for manual inputs. You may use some of the QGIS functions, [extra position variables](../../layer/position_variables/) or [extra QGIS variables](../../layer/plugin-variables/).
 
diff --git a/src/gis/photo-names/index.md b/src/gis/photo-names/index.md
index 3f03ee51..07dc88ae 100644
--- a/src/gis/photo-names/index.md
+++ b/src/gis/photo-names/index.md
@@ -18,7 +18,7 @@ To set up custom photo names:
 3. In the **Expression Dialog** window, enter the expression that should be used as the photo's name. Please, keep in mind [basic recommendations](#best-practice-for-photo-name-expressions) to make sure the naming works as intended.
 
    Here we use a combination of the layer's name, <MainPlatformName /> username and current timestamp (other examples ale listed [below](#examples-of-photo-names-expressions)): 
-   ` @layer_name + '-' +  @mergin_username + '-' + format_date(now(),'yyMMddhhmmss')`
+   ` @layer_name + '-' +  @mm_username + '-' + format_date(now(),'yyMMddhhmmss')`
    
    Example result is displayed in the **Preview**: `hedges-sarah-230707194052`
    
@@ -38,7 +38,7 @@ There are some tips to keep in mind when creating the expression for your photo
 
 :white_check_mark: **Each photo needs to have a unique name** to avoid issues during synchronisation and ensure that photos and features are linked correctly.
 
-Therefore, we recommend using combinations of variables that will ensure that there would not be multiple photos with the same name, such as the current date and time `now()`, <MainPlatformName /> username `@mergin_username`, layer name `@layer_name` or a field value.
+Therefore, we recommend using combinations of variables that will ensure that there would not be multiple photos with the same name, such as the current date and time `now()`, <MainPlatformName /> username `@mm_username`, layer name `@layer_name` or a field value.
 
 :white_check_mark: The file extension (`.jpg`) is added automatically.
 
@@ -55,7 +55,7 @@ In general, it is useful to use some of these variables:
 
   It can be variously reformatted using the `format_date()` function. See <QGISHelp ver="latest" link="/user_manual/expressions/functions_list.html#format-date" text="See QGIS User manual" /> for more details.
   
-- When working in a team, consider using <MainPlatformName /> username `@mergin_username`.
+- When working in a team, consider using <MainPlatformName /> username `@mm_username`.
   
   Even if multiple team members capture a photo at the same time, the name will be different. Also, it makes it easy to sort photos based on who took them. 
 
@@ -67,7 +67,7 @@ In general, it is useful to use some of these variables:
 ### Examples of photo names expressions
 Here are some example expressions that can be used or modified to fit your needs:
 
-- Expression: ` @layer_name + '-' +  @mergin_username + '-' + format_date(now(),'yyMMddhhmmss')`
+- Expression: ` @layer_name + '-' +  @mm_username + '-' + format_date(now(),'yyMMddhhmmss')`
    - Preview: `hedges-sarah-230707154052.jpg`
    - Description: This is a combination of the name of a layer (`hedges`), <MainPlatformName /> username (`sarah`) and reformatted timestamp that starts with the year and ends with seconds.
 
diff --git a/src/index.md b/src/index.md
index c252028f..112f7cd1 100644
--- a/src/index.md
+++ b/src/index.md
@@ -39,6 +39,7 @@ The ecosystem consist of various components:
 
 ## Manage Account & Project
 - [User Account](./manage/account/)
+- [Single Sign-On (SSO)](./manage/sso/)
 - [Workspaces](./manage/workspaces/)
 - [Subscriptions and Invoicing](./manage/subscriptions/)
 - [Member Roles and Permissions](./manage/permissions/)
@@ -121,7 +122,7 @@ The ecosystem consist of various components:
 
 ## Support & Legal
 - [Licensing](./misc/licensing/)
+- [Get Involved](./misc/get-involved/)
 - [Troubleshoot](./misc/troubleshoot/)
-- [Contribute](./misc/contribute/)
 - [Write Documentation](./misc/write-docs/)
 
diff --git a/src/layer/form-configuration/index.md b/src/layer/form-configuration/index.md
index 18e86dae..ca486321 100644
--- a/src/layer/form-configuration/index.md
+++ b/src/layer/form-configuration/index.md
@@ -31,14 +31,14 @@ Various usage of default values can be explored in more detail by downloading or
 Let's set up an attributes to record the <MainPlatformName /> username of the surveyor who *created* a feature:
 1. Right-click on a layer, select **Properties** and go to the **Attributes form** tab.
 2. In the list of **Available Widgets** select the text field you want to use (here: `inserted_by`)
-3. In the **Defaults** tab, define the **Default value** as `@mergin_username`. 
+3. In the **Defaults** tab, define the **Default value** as `@mm_username`. 
    Do not check the **Apply default value on update** option :white_large_square:.
 
 ![QGIS attributes form Mergin Maps username default value](./qgis-form-default-inserted-by.jpg "QGIS attributes form Mergin Maps username default value")
 
 To save the <MainPlatformName /> username of the surveyor who *modified* this feature, the steps are similar:
 1. In the list of **Available Widgets** select the text field you want to use (here: `updated_by`)
-2. In the **Defaults** tab, define the **Default value** as `@mergin_username`. 
+2. In the **Defaults** tab, define the **Default value** as `@mm_username`. 
    Check the **Apply default value on update** option :heavy_check_mark:. The field will be updated anytime the feature is modified, saving the name of the surveyor who made the changes.
 
 ![QGIS attributes form Mergin Maps username default value](./qgis-form-default-updated-by.jpg "QGIS attributes form Mergin Maps username default value")
@@ -81,7 +81,7 @@ There are some commonly used default values that can be useful in your field sur
 
 - It is convenient to know when a feature was created and when it was last updated. Use fields with **Date** or **Date&Time** data types with the `now()` function to record this information. You can change the formatting using the [Date/Time](../form-widgets/#date-and-time) widget.
 
-- The name of the <MainPlatformName /> user who created or modified the feature can be recorded using the `@mergin_username` variable. These fields should use **Text (string)** data type. 
+- The name of the <MainPlatformName /> user who created or modified the feature can be recorded using the `@mm_username` variable. These fields should use **Text (string)** data type. 
   There are also other [extra QGIS variables](../position_variables/) related to your <MainPlatformName /> account or service that can be used as default values.
 
 - The coordinates of a point feature can be recorded as well using the `$x` and `$y` function in QGIS. To record the coordinate accurately, these fields should have the **Decimal number (real)** data type.  If the coordinates are in metres, values can be rounded to, say, 2-3 decimal places. When working with geographic coordinates that use degrees, you may want to round the coordinates to 8 decimal places. Use the *apply default value on update* option so that you have correct values when the position of the point feature changes.
@@ -96,8 +96,8 @@ Here are some examples:
 |-----------------------------|-------------------------------|---------|-------------|
 | `@now`          | `2024-06-30 10:00:00`                      | **no**  | The timestamp of when the feature was created. |
 | `@now`          | `2024-06-30 10:30:00`                     | **yes**  | The timestamp of when the feature was last **updated**. |
-| `@mergin_username`          | `sarah`                      | **no**  | Name of the user who created this feature.|
-| `@mergin_username`          | `jack`                      | **yes**  | Name of the user who **updated** this feature last.|
+| `@mm_username`          | `sarah`                      | **no**  | Name of the user who created this feature.|
+| `@mm_username`          | `jack`                      | **yes**  | Name of the user who **updated** this feature last.|
 | `round($x,2)`          | `1898789.92`                      | **yes**  | The X coordinate of a point feature, rounded to 2 decimal places.|
 | `$length`          | `123.45`                      | **yes**  | The length of a line feature.|
 | `$area`          | `1234.56`                      | **yes**  | The area of a polygon feature.|
@@ -164,6 +164,9 @@ In the <MobileAppNameShort />, you will be unable to save a feature unless the f
 ![Mergin Maps mobile app constraints in attributes form](./mobile-form-constaints.jpg "Mergin Maps mobile app constraints in attributes form")
 
 ## Drill-down forms
+
+<YouTube id="bXRclQFQFFE" />
+
 Drill-down or cascade forms enable to list values in a field depending on a value selected in another field.
 
 :::tip Example project available
diff --git a/src/layer/form-widgets/index.md b/src/layer/form-widgets/index.md
index e25f46f5..6aecdeeb 100644
--- a/src/layer/form-widgets/index.md
+++ b/src/layer/form-widgets/index.md
@@ -214,6 +214,8 @@ Value map widget is used to select a value from a drop-down menu. Values are def
 
 If you want to use multiple selections in a field or need to add new values during the survey, check out the [Value Relation](#value-relation) widget.
 
+<YouTube id="WjotOTIKaNo" />
+
 :::tip Example project available
 This public project <MerginMapsProject id="documentation/form-widgets" /> contains a Value Map field. Download or clone it to see the setup.
 :::
@@ -236,6 +238,8 @@ Now you can select the value from a drop-down menu in the <MobileAppNameShort />
 This public project <MerginMapsProject id="documentation/form-widgets" /> contains a Value Relation setup. Download or clone it to explore it in more detail.
 :::
 
+<YouTube id="Sm1PZRN8rLw" />
+
 The **Value Relation** widget is similar to the [Value Map](#value-map) widget, but the values for the drop-down menu come from another layer (usually a non-spatial table). 
 
 To have the option to safely add new values when working collaboratively, the value table should have a unique field with UUID values. This field should use the `uuid()` function as a [default value](../attach-multiple-photos-to-features/), so that every new entry has its UUID.
diff --git a/src/manage/account/dashboard-forgot-password.jpg b/src/manage/account/dashboard-forgot-password.jpg
deleted file mode 100644
index e4738360..00000000
Binary files a/src/manage/account/dashboard-forgot-password.jpg and /dev/null differ
diff --git a/src/manage/account/dashboard-forgot-password.xcf b/src/manage/account/dashboard-forgot-password.xcf
deleted file mode 100644
index a9a351a9..00000000
Binary files a/src/manage/account/dashboard-forgot-password.xcf and /dev/null differ
diff --git a/src/manage/account/forgotten-password.jpg b/src/manage/account/forgotten-password.jpg
new file mode 100644
index 00000000..4a74ca53
Binary files /dev/null and b/src/manage/account/forgotten-password.jpg differ
diff --git a/src/manage/account/forgotten-password.xcf b/src/manage/account/forgotten-password.xcf
new file mode 100644
index 00000000..dc563a2d
Binary files /dev/null and b/src/manage/account/forgotten-password.xcf differ
diff --git a/src/manage/account/index.md b/src/manage/account/index.md
index 3ea0b158..87fe56ea 100644
--- a/src/manage/account/index.md
+++ b/src/manage/account/index.md
@@ -70,11 +70,11 @@ You will be prompted to confirm the closing of your account by typing the accoun
 After you close the account, it is kept on <MainPlatformNameLink /> servers for 5 days before it is deleted permanently. During this period, it can be restored if you contact <MerginMapsEmail id="support" />.
 
 ## Forgotten password
-If you forget your password, you can reset it through <AppDomainNameLink /> by clicking **Forgot password**. Email with password reset link will be sent to your email address.
-![Mergin Maps dashboard forgot password](./dashboard-forgot-password.jpg "Mergin Maps dashboard forgot password")
+If you forget your password, you can easily reset it. 
 
-The same can be through the login page in the <MobileAppNameShort />
-![Mergin Maps mobile app forgot password](./mobile-app-forgot-password.jpg "Mergin Maps mobile app forgot password")
+You can find the **Forgot password?** option on the <DashboardShortLink /> or the <MobileAppNameShort /> log in page. Email with password reset link will be sent to your email address.
+
+![Mergin Maps forgotten password](./forgotten-password.jpg "Mergin Maps forgotten password")
 
 ::: tip
 Check your spam folder if the email with password reset link does not appear in your inbox after a few minutes. 
diff --git a/src/manage/account/mobile-app-forgot-password.jpg b/src/manage/account/mobile-app-forgot-password.jpg
deleted file mode 100644
index 1180eb99..00000000
Binary files a/src/manage/account/mobile-app-forgot-password.jpg and /dev/null differ
diff --git a/src/manage/account/mobile-app-forgot-password.xcf b/src/manage/account/mobile-app-forgot-password.xcf
deleted file mode 100644
index a0342cf5..00000000
Binary files a/src/manage/account/mobile-app-forgot-password.xcf and /dev/null differ
diff --git a/src/manage/dashboard/index.md b/src/manage/dashboard/index.md
index 5e1321fa..25b271c1 100644
--- a/src/manage/dashboard/index.md
+++ b/src/manage/dashboard/index.md
@@ -68,13 +68,22 @@ In **Settings**, you can:
 
 
 ## Members
-The **Members** tab provides the overview of the [members and guests](../permissions/#workspace-members-and-guests) of the workspace, as well as pending invitations. 
-Here, you can [**invite**](../project-advanced/#add-users-to-a-workspace) users to the workspace and manage the [roles](../permissions/#workspace-member-roles-and-project-permissions) of your workspace members. If needed, users can be also removed from the workspace.
+The **Members** tab provides the overview of the [members and guests](../permissions/#workspace-members-and-guests) of the workspace, as well as pending invitations. You can use the [**invite**](../project-advanced/#add-users-to-a-workspace) option to add users to the workspace.
+
+This tab is only available to [owners and admins](../permissions/#workspace-member-roles-and-project-permissions) of a workspace.
+
+Here, you can:
+- see the email addresses, usernames and names of your workspace users
+- see and change the [roles](../permissions/#workspace-member-roles-and-project-permissions) of your workspace members
+- see the **Member type**, whether the user is a [contributor](../subscriptions/#contributors) or a read-only guest. Only contributors are counting towards your [subscription](../subscriptions/).
+- remove users from the workspace
+
+
 
 ![Mergin Maps dashboard workspace members](./mergin-maps-dashboard-members.jpg "Mergin Maps dashboard workspace members")
 
 ## Subscriptions
-The **Subscriptions** tab contains information about your [subscription plan](../subscriptions/).
+The **Subscriptions** tab contains information about your [subscription plan](../subscriptions/). This tab is only available to [owners](../permissions/#workspace-member-roles-and-project-permissions) of a workspace.
 
 Here, you can find the current usage of storage, number of users (members and guests) and number of projects in your workspace.
 
@@ -91,13 +100,16 @@ For details about different subscription plans visit our <MainDomainNameLink id=
 :::
 
 ## Settings
-In the **Settings** tab, you will find information about the current workspace.
+In the **Settings** tab, you will find information about the current workspace. 
+
+Here, [admins and owners](../permissions/#workspace-member-roles-and-project-permissions) of a workspace can set up or manage [Single sign-on (SSO)](../sso/).
+
+[Owners](../permissions/#workspace-member-roles-and-project-permissions) of a workspace can also:
 - use **Edit Workspace** to add or change the description of the workspace
 - use **Close Workspace** to [delete the workspace](../workspaces/#how-to-delete-a-workspace)
 
 ![Mergin dashboard web workspace settings](./mergin-maps-dashboard-settings.jpg "Mergin Maps dashboard workspace settings")
 
-
 ## User profile
 **Your profile** can be accessed by clicking on the user name in the upper right corner.
 
diff --git a/src/manage/dashboard/mergin-maps-dashboard-members.jpg b/src/manage/dashboard/mergin-maps-dashboard-members.jpg
index a4c759f2..d7e7b122 100644
Binary files a/src/manage/dashboard/mergin-maps-dashboard-members.jpg and b/src/manage/dashboard/mergin-maps-dashboard-members.jpg differ
diff --git a/src/manage/dashboard/mergin-maps-dashboard-members.xcf b/src/manage/dashboard/mergin-maps-dashboard-members.xcf
index cbcfd3ee..0e9182f8 100644
Binary files a/src/manage/dashboard/mergin-maps-dashboard-members.xcf and b/src/manage/dashboard/mergin-maps-dashboard-members.xcf differ
diff --git a/src/manage/dashboard/mergin-maps-dashboard-settings.jpg b/src/manage/dashboard/mergin-maps-dashboard-settings.jpg
index 426596d9..16824ae6 100644
Binary files a/src/manage/dashboard/mergin-maps-dashboard-settings.jpg and b/src/manage/dashboard/mergin-maps-dashboard-settings.jpg differ
diff --git a/src/manage/dashboard/mergin-maps-dashboard-settings.xcf b/src/manage/dashboard/mergin-maps-dashboard-settings.xcf
index 029f9415..43de5017 100644
Binary files a/src/manage/dashboard/mergin-maps-dashboard-settings.xcf and b/src/manage/dashboard/mergin-maps-dashboard-settings.xcf differ
diff --git a/src/manage/permissions/index.md b/src/manage/permissions/index.md
index b153933b..f084fe3c 100644
--- a/src/manage/permissions/index.md
+++ b/src/manage/permissions/index.md
@@ -4,20 +4,22 @@
 Permissions control access to your <MainPlatformName /> projects. They can be defined for the whole workspace or for a specific project.
 
 ## Workspace members and guests
-People invited to a workspace can be invited as **members** or as **guests**.
+People invited to a workspace can be invited as **members** or as **guests**. See [How to share projects and manage user access](../project-advanced/#share-projects-and-manage-user-access) for detailed step.
 
 **Members** have access to *all* projects in a workspace. If a new project is created, they will be able to access it immediately. This means you do not have to grant them permissions to new projects manually. The level of access to the workspace is defined by their member roles. There are 5 [member roles](#workspace-member-roles-and-project-permissions) available: *reader*, *editor*, *writer*, *admin* and *owner*.
 
 **Guests** have access only to projects they are invited to. If you want to only share specific projects with someone, you should invite them to your workspace as a guest.  The level of access to a project is defined by project permissions. There are 4 [permission](#workspace-member-roles-and-project-permissions) levels: *reader*, *editor*, *writer*, and *owner*.
 
-:::tip
-You can find detailed steps on how to invite users to your workspace in [How to share projects and manage user access](../project-advanced/#share-projects-and-manage-user-access).
+:::tip Members, guests and contributors
+Subscriptions are based on the number of *contributors* on the workspace. *Contributors* are members or guests with writer, editor, admin or owner access.
+
+*Readers* do not count as contributors. The number of read-only users in your workspace does not affect your subscription.
 :::
 
 ## Workspace member roles and project permissions
 Member roles and project permissions present similar options in terms of what a user can or cannot do. The difference is whether these options are defined on a workspace or on a project level. Compare the overview of [workspace member roles](#workspace-member-roles-overview) and of [project permissions](#project-permissions-overview) for more details.
 
-- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-history/), but can not make any changes.
+- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-history/), but can not make any changes. *Readers* do not count as [contributors](../subscriptions/#contributors) in your subscription.
 - **Editor** (available on <MainPlatformNameLink /> Cloud and <EnterprisePlatformNameLink />): In addition to the **Read** access, users can [add/remove/update features](../../field/mobile-features/), but *cannot* make changes in the project properties, add/remove fields in GeoPackage layers or remove GeoPackage files from the project. We recommend using this role for surveyors - users who collect data in the field.
 Editors can:
 	- *add* files such as photos, shapefiles, GeoPackage files - any file except for `*.qgs`, `*.qgz`, `mergin-config.json`
@@ -47,6 +49,7 @@ This is the overview of workspace member roles that are related to the whole wor
 |delete and transfer projects| :no_entry_sign: | :no_entry_sign:  | :no_entry_sign:  | :white_check_mark: | :white_check_mark: |
 |manage access to projects| :no_entry_sign: | :no_entry_sign: | :no_entry_sign:  | :white_check_mark: | :white_check_mark: |
 |manage workspace members| :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: |
+|set up and manage [SSO](../sso/)| :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: |
 |delete the workspace and change its description| :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: |
 |access to invoicing and subscription settings| :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: |
 
diff --git a/src/manage/plugin/plugin-configure.jpg b/src/manage/plugin/plugin-configure.jpg
index fae72f1a..b893b939 100644
Binary files a/src/manage/plugin/plugin-configure.jpg and b/src/manage/plugin/plugin-configure.jpg differ
diff --git a/src/manage/plugin/plugin-configure.xcf b/src/manage/plugin/plugin-configure.xcf
index ad396512..436ad506 100644
Binary files a/src/manage/plugin/plugin-configure.xcf and b/src/manage/plugin/plugin-configure.xcf differ
diff --git a/src/setup/sign-up-to-mergin-maps/dashboard-workspace-settings-sso.jpg b/src/manage/sso/dashboard-workspace-settings-sso.jpg
similarity index 100%
rename from src/setup/sign-up-to-mergin-maps/dashboard-workspace-settings-sso.jpg
rename to src/manage/sso/dashboard-workspace-settings-sso.jpg
diff --git a/src/manage/sso/index.md b/src/manage/sso/index.md
new file mode 100644
index 00000000..10bcc60c
--- /dev/null
+++ b/src/manage/sso/index.md
@@ -0,0 +1,32 @@
+# Single Sign-On (SSO)
+[[toc]]
+
+Single sign-on (SSO) is an authentication method that allows you to sign in to <MainPlatformName /> using the same credentials as you use in your organisation. SSO is available on the <DashboardNameShort />, the <MobileAppNameShort /> and the <QGISPluginNameShort />.
+
+This means you don't have to create a new <MainPlatformName /> account with a specific password: you can simply use your work email. The identity provider (e.g. Microsoft Entra ID or Auth0) used by your organisation will check your credential and redirect you back to <MainPlatformName />.
+
+<MainPlatformName /> account will be created automatically after the first sign in via SSO.
+
+When a user signs in to <MainPlatformName /> using SSO, they will stay signed in for a time period before they are asked to enter their credentials again. By default, this period is set to 14 days. If you use <EnterprisePlatformNameLink />, you can set it to a different value.
+
+::: warning Removing workspace users
+If you remove a user from your Identity provider (you remove their account in your organisation), they will still be able to log into the <MainPlatformName /> workspace for 14 days. 
+
+To cancel their access to the workspace immediately, you have to remove them manually through the [Members tab](../dashboard/#members) on the <DashboardShortLink />.
+:::
+
+### Connection setup
+If you are the admin or owner of a workspace and you want to set up SSO, please contact our <MainDomainNameLink id="contact-sales" desc="sales team"/>.
+
+You will receive a link with a step-by-step guide for your identity provider. Currently, we support **SAML** and **OIDC** SSO protocols. Directory sync is not supported.
+
+::: tip SSO for self-hosted servers <ServerType type="EE" />
+If you want to use SSO on your <EnterprisePlatformNameLink /> server, you can do so from the admin panel. See [Single Sign-On Deployment](../../server/sso-deployment/) for more details.
+
+SSO is not available for <CommunityPlatformName />.
+:::
+
+Once SSO is configured for your workspace, you will see the relevant information in the <DashboardLink id="settings" desc="workspace settings page"/>, under the *advanced* section. If you need to make any changes to your SSO connection, please <MerginMapsEmail id="support" desc="contact our support team"/>.
+
+![Mergin Maps workspace settings with enabled SSO](./dashboard-workspace-settings-sso.jpg "Mergin Maps workspace settings with enabled SSO")
+
diff --git a/src/manage/subscriptions/index.md b/src/manage/subscriptions/index.md
index 8a740018..5cba4fbe 100644
--- a/src/manage/subscriptions/index.md
+++ b/src/manage/subscriptions/index.md
@@ -1,29 +1,29 @@
 # Subscriptions and Invoicing
 [[toc]]
 
-::: tip Pricing and features
-Subscription details and pricing are summarised on our <MainDomainNameLink id="pricing" desc="pricing page"/>. 
+::: tip Pricing, features, free trial
+Subscription details and pricing are summarised on our <MainDomainNameLink id="pricing" desc="pricing page"/>. After signing up to <MainPlatformNameLink />, you can use your workspace for free during the **14 day trial**. After the trial, you can [choose a premium plan](#how-to-upgrade-a-subscription-from-the-trial-plan).
 
 The current *Premium* subscription system is explained in more detail in our blog <MainDomainNameLink id="blog/unlocking-premium-features-of-mergin-maps-for-all" desc="Unlocking premium features of Mergin Maps for all"/>.
 :::
 
-Subscriptions are based on the number of *contributors* on the workspace. Per each contributor seat, you get 1 GB of storage. Storage is shared across the whole workspace. 
+::: details Legacy subscription plans: Individual, Professional and Team plan
+The subscription plans of <MainPlatformName /> may change over time as the platform evolves. You can decide to switch to a new plan anytime in the subscription management page.
 
-*Contributors* are workspace members or guests who have Writer, Editor, Admin or Owner [access rights](../permissions/).  The number of read-only users is unlimited: they do not count towards your workspace contributors. 
+Even if you still use a plan that is no longer offered, features included in this plan stay unaltered. For instance, previously-used *Individual* or *Professional* subscriptions did not include features such as [webmaps](../dashboard-maps/) or developer tools ([Python and C++ integrations](../../dev/integration/), [DB Sync](../../dev/dbsync/), [Media Sync](../../dev/media-sync/), [Work Packages](../../dev/work-packages/)). To use these features, you will have to switch to a *Premium* subscription.
+:::
 
-The overview of your current subscription plan, such as storage usage, number of projects and number of contributors in your workspace can be found in the **Subscription** tab on <DashboardLink />. It is available only to the [owners](../permissions/#workspace-member-roles-and-project-permissions) of the workspace.
+## Contributors
 
-![Mergin Maps Dashboard Subscription tab](../dashboard/mergin-maps-dashboard-subscriptions.jpg "Mergin Maps Dashboard Subscription tab")
+Subscriptions are based on the number of *contributors* on the workspace. Per each contributor seat, you get 1 GB of storage. Storage is shared across the whole workspace. You can get even more storage, just reach out to our <MerginMapsEmail id="sales" desc="sales team" /> and we will help you set it up.
 
-::: tip Trial period
-After signing up to <MainPlatformNameLink />, you can use your workspace for free during the **14 day trial**. After the trial, you can [choose a premium plan](#how-to-upgrade-a-subscription-from-the-trial-plan).
-:::
+*Contributors* are workspace members or guests who have Writer, Editor, Admin or Owner [access rights](../permissions/). The number of read-only users is unlimited: they do not count towards your workspace contributors. 
 
-::: details Legacy subscription plans: Individual, Professional and Team plan
-The subscription plans of <MainPlatformName /> may change over time as the platform evolves. You can decide to switch to a new plan anytime in the subscription management page.
+[Owners](../permissions/#workspace-member-roles-and-project-permissions) of the workspace can find the overview of the subscription plan, such as storage usage, number of projects and number of contributors in the workspace in the [**Subscription**](../dashboard/#subscriptions) tab on the <DashboardShortLink />. 
 
-Even if you still use a plan that is no longer offered, features included in this plan stay unaltered. For instance, previously-used *Individual* or *Professional* subscriptions did not include features such as [webmaps](../dashboard-maps/) or developer tools ([Python and C++ integrations](../../dev/integration/), [DB Sync](../../dev/dbsync/), [Media Sync](../../dev/media-sync/), [Work Packages](../../dev/work-packages/)). To use these features, you will have to switch to a *Premium* subscription.
-:::
+The overview of workspace users and their member type (contributor/read-only) can be found in the [**Members**](../dashboard/#members) tab on the <DashboardShortLink />. It is available to [owners and admins](../permissions/#workspace-member-roles-and-project-permissions) of a workspace.
+
+![Mergin Maps Dashboard Subscription tab](../dashboard/mergin-maps-dashboard-subscriptions.jpg "Mergin Maps Dashboard Subscription tab")
 
 ## Subscriptions management portal
 Subscriptions, payments and billing information are managed in our subscription management portal. 
diff --git a/src/misc/contribute/index.md b/src/misc/contribute/index.md
deleted file mode 100644
index 9481c6db..00000000
--- a/src/misc/contribute/index.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Contribute
-
-How to contribute to the project? 
-
-We are happy to help to promote work or co-author and place on our websites or give special offer for <MainPlatformNameLink /> Cloud for project contributors.
-
-<CommunityJoin />
-
-## Use and review
-
-Write a review of the application on App Store or Android Google Play
-
-<AppDownload />
-
-## Translate
-
-To help with translations, join [<MainPlatformName /> Transifex team](https://www.transifex.com/lutra-consulting/mergin-maps-mobile/)
-
-## Write or talk about us 
- 
- - Publish paper about the technology
- - Write a blog post 
- - Write a case study 
- - Create a YouTube video and share
- - Create tweet, Facebook post 
- - Talk on conferences
-
- Follow us on 
-
- - [Facebook](https://www.facebook.com/lutraconsulting)
- - [Twitter](https://twitter.com/lutraconsulting)
-
-## Test
-
-Test the application and report the bugs
-
- - <GitHubRepo id="MerginMaps/mobile/issues" desc="Mergin Maps mobile app" />
- - <GitHubRepo id="MerginMaps/server/issues" desc="Mergin Maps server" />
- - <GitHubRepo id="MerginMaps/qgis-plugin/issues" desc="Mergin Maps QGIS Plugin" />
- 
-or for other subprojects
-
-## Develop
-
-Software developer? Code and prepare a pull request. We will help you with setup of the development environment and answer your questions.
- 
- - <GitHubRepo id="MerginMaps/mobile/issues" desc="Mergin Maps mobile app" />
- - <GitHubRepo id="MerginMaps/server/issues" desc="Mergin Maps server" />
- - <GitHubRepo id="MerginMaps/qgis-plugin/issues" desc="Mergin Maps QGIS Plugin" />
- 
-or for other subprojects
-
-## Donate or subscribe
-
- - Donate
- - <AppDomainNameLink  desc="Subscribe" /> to the <MainPlatformName />
- - Sponsor a bug-fixing sprint, or a new feature
diff --git a/src/misc/get-involved/index.md b/src/misc/get-involved/index.md
new file mode 100644
index 00000000..b375b24e
--- /dev/null
+++ b/src/misc/get-involved/index.md
@@ -0,0 +1,54 @@
+# Get Involved
+
+How to contribute to the project? 
+
+We are happy to help to promote work or co-author and place on our websites or give special offer for <ServerCloudNameLink /> for project contributors.
+
+<CommunityJoin />
+
+## Use and review
+
+Write a review of the application on App Store or Android Google Play
+
+<AppDownload />
+
+## Translate
+
+To help with translations, join [<MainPlatformName /> Transifex team](https://www.transifex.com/lutra-consulting/mergin-maps-mobile/)
+
+## Write or talk about us 
+ 
+ - Publish a paper about the technology
+ - Write a blog post 
+ - Write a case study 
+ - Create a YouTube video and share
+ - Create tweets, Facebook posts 
+ - Talk on conferences
+
+ Follow us on 
+
+- [<NoSpellcheck id="LinkedIn" />](https://www.linkedin.com/company/mergin-maps/)
+- [Facebook](https://www.facebook.com/lutraconsulting)
+- [X](https://x.com/lutraconsulting)
+
+## Test
+
+Test the <MobileAppNameShort />, <QGISPluginNameShort />, server or other tools and report bugs in the corresponding <GitHubRepo id="MerginMaps/" desc="Mergin Maps" /> repositories:
+- <GitHubRepo id="MerginMaps/mobile/issues" desc="Mergin Maps mobile app" />
+- <GitHubRepo id="MerginMaps/server/issues" desc="Mergin Maps server" />
+- <GitHubRepo id="MerginMaps/qgis-plugin/issues" desc="Mergin Maps QGIS Plugin" />
+
+## Develop
+
+Software developer? Code and prepare a pull request in <GitHubRepo id="MerginMaps/" desc="Mergin Maps" /> repositories.
+- <GitHubRepo id="MerginMaps/mobile/issues" desc="Mergin Maps mobile app" />
+- <GitHubRepo id="MerginMaps/server/issues" desc="Mergin Maps server" />
+- <GitHubRepo id="MerginMaps/qgis-plugin/issues" desc="Mergin Maps QGIS Plugin" />
+
+We will help you with the setup of the development environment and answer your questions.
+
+## Donate or subscribe
+
+- Subscribe to the <MainPlatformNameLink />
+- Sponsor a bug-fixing sprint or a new feature. Contact our <MerginMapsEmail id="sales" desc="sales team" /> team to discuss this option.
+- Contribute to a [QGIS crowdfunding](https://www.lutraconsulting.co.uk/crowdfunding) campaigns
diff --git a/src/misc/troubleshoot/index.md b/src/misc/troubleshoot/index.md
index 115ada76..d9fba0b3 100644
--- a/src/misc/troubleshoot/index.md
+++ b/src/misc/troubleshoot/index.md
@@ -98,4 +98,8 @@ In the <MobileAppNameShort />:
 3. Tap the **Send to developers** button to proceed
    ![Send diagnostic log to developers](./mobile-app-send-diagnostic-log.jpg "Diagnostic log content in Mergin Maps mobile app")
 
-4. Contact our support team (<MerginMapsEmail id="support" />) with your username/workspace and problem description so we can have a look into the issue. 
+4. Contact our support team (<MerginMapsEmail id="support" />) with your username/workspace and problem description so we can have a look into the issue.
+
+## Common issues
+The following are some common issues encountered by users:
+- [Project fails to sync and there is a *Gateway Timeout* or *502 Bad Gateway* error](./not_syncing/#gateway-timeout-or-502-bad-gateway) 
diff --git a/src/misc/troubleshoot/not_syncing/index.md b/src/misc/troubleshoot/not_syncing/index.md
new file mode 100644
index 00000000..0f0efc3d
--- /dev/null
+++ b/src/misc/troubleshoot/not_syncing/index.md
@@ -0,0 +1,25 @@
+# Project fails to sync
+[[toc]]
+
+## Gateway Timeout or 502 Bad Gateway
+
+The most common cause of a **Gateway Timeout** or **502 Bad Gateway** error is that there are more files to upload than can be processed before the server returns a timeout error.  If this happens, this is the recommended workaround:
+
+1. If the sync is from a mobile device, [transfer the project files](../../../manage/missing-data/#manual-data-transfer-android) from the mobile device with the following exceptions:
+
+    - Only transfer the photo attachments from the mobile device project (if you are transferring from an iOS device, you can ignore this)
+    - Recreate the same folder structure in the destination folder as the photos are stored in the mobile device. For example, if all photos are in the project folder, then transfer them to the same folder on your PC/laptop. If there are subfolders, recreate the subfolders and transfer photos to the correct subfolder on the destination device.
+
+2. If you have not already downloaded the project on the PC/laptop, do so now [using the <QGISPluginName />](../../../tutorials/opening-surveyed-data-on-your-computer/#locating-and-opening-your-project), if you have downloaded the project already skip this step.
+
+3. Open the project folder for the version downloaded from the <QGISPluginNameShort /> on your PC/laptop
+
+4. Open the folder on your PC/laptop where you transferred the photos/project files from your mobile device
+
+5. Cut and paste up to 100 photo attachments from the transferred project directory to the same location in your QGIS project directory (if photos are duplicates you can either overwrite or skip)
+
+6. Open the project in QGIS and synchronise - if you get another Bad Gateway or Sever timeout error, remove the transferred photos from the QGIS project directory and try step 5 again but copy fewer photos 
+
+7. Repeat steps 5 and 6 until all photos have been moved from the transferred directory to the QGIS project directory
+
+8. Open the project on the mobile device and synchronise 
diff --git a/src/misc/write-docs/index.md b/src/misc/write-docs/index.md
index b15917ed..918b9dc1 100644
--- a/src/misc/write-docs/index.md
+++ b/src/misc/write-docs/index.md
@@ -469,6 +469,8 @@ Use `<DashboardShortLink />` component, transforms to  <DashboardShortLink />
 
 Use `<ServerCloudName />` component, transforms to <ServerCloudName />
 
+Use `<ServerCloudNameLink />` component, transforms to <ServerCloudNameLink />
+
 Use `<CommunityPlatformName />` component, transforms to <CommunityPlatformName />
 
 Use `<CommunityPlatformNameLink />` component, transforms to <CommunityPlatformNameLink />
diff --git a/src/server/index.md b/src/server/index.md
index b97048c1..8a21ec48 100644
--- a/src/server/index.md
+++ b/src/server/index.md
@@ -2,7 +2,16 @@
 
 SaaS <MainPlatformName /> service is a web platform for storage and synchronisation of data between mobile devices, <MainPlatformNameLink /> service and QGIS Desktop. 
 
-There is also **<MainPlatformName /> Community Edition** (<CommunityPlatformNameLink />) that is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/server" />.
+There are also custom server deployments: 
+[[toc]]
+
+You can read more about them in our blog [<MainPlatformName /> Community and Enterprise Editions](https://merginmaps.com/blog/introducing-mergin-maps-community-and-enterprise-editions).
+
+## Mergin Maps CE
+
+**<MainPlatformName /> Community Edition** (<CommunityPlatformNameLink />) is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/server" />.
+
+## Mergin Maps EE
 
 **Mergin Maps Enterprise Edition** (<EnterprisePlatformNameLink />) provides an enterprise environment with additional features such as multiple [workspaces](../manage/workspaces/) or [webmaps](../manage/dashboard-maps/). There are three types of <EnterprisePlatformNameLink />:
 - *Cloud* that uses <AppDomainNameLink /> (the same server as is used by other <MainPlatformName /> users)
@@ -11,8 +20,8 @@ There is also **<MainPlatformName /> Community Edition** (<CommunityPlatformName
 
 This section of documentation is relevant for the **On-Premises <EnterprisePlatformName />** and **<CommunityPlatformName />**.
 
-:::tip
-**Interested in using <EnterprisePlatformName />?** Information about <EnterprisePlatformName />, its features and pricing can be found on our [website](https://merginmaps.com/pricing-for-ce-and-ee). Contact our <MerginMapsEmail id="sales" desc="sales team" /> for more details.
+:::tip Interested in using <EnterprisePlatformName />?
+<EnterprisePlatformName /> features and pricing can be found on our [website](https://merginmaps.com/pricing). 
 
-You can read more about <CommunityPlatformName /> and <EnterprisePlatformName /> in our blog [<MainPlatformName /> Community and Enterprise Editions](https://merginmaps.com/blog/introducing-mergin-maps-community-and-enterprise-editions).
+Contact our <MerginMapsEmail id="sales" desc="sales team" /> for more details.
 :::
diff --git a/src/server/plugin-mobile-app/index.md b/src/server/plugin-mobile-app/index.md
index 9377a031..c14681e5 100644
--- a/src/server/plugin-mobile-app/index.md
+++ b/src/server/plugin-mobile-app/index.md
@@ -5,6 +5,11 @@ There is a default server <AppDomainNameLink /> which is configured in <QGISPlug
 
 To do this, we need to set up the custom server in the [plugin](#custom-server-configuration-in-mergin-maps-qgis-plugin) as well as in the [mobile app](#custom-server-configuration-in-mergin-maps-mobile-app).
 
+::: warning Server version compatibility
+Please note that the <MobileAppName /> and <QGISPluginName /> require the server version 2023.2 or higher.
+
+See how to [upgrade](../upgrade/) your server if needed. 
+:::
 
 ## Custom server configuration in Mergin Maps QGIS plugin
 To configure a custom <MainPlatformName /> server in the <QGISPluginNameShort />:
diff --git a/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.jpg b/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.jpg
index 4218f40a..ed7d5121 100755
Binary files a/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.jpg and b/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.jpg differ
diff --git a/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.xcf b/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.xcf
index e659cf49..d3f25aec 100755
Binary files a/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.xcf and b/src/setup/install-mergin-maps-plugin-for-qgis/qgis-mergin-settings.xcf differ
diff --git a/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.jpg b/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.jpg
new file mode 100644
index 00000000..0fc43234
Binary files /dev/null and b/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.jpg differ
diff --git a/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.xcf b/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.xcf
new file mode 100644
index 00000000..eae0d5c2
Binary files /dev/null and b/src/setup/sign-up-to-mergin-maps/dashboard-sign-up.xcf differ
diff --git a/src/setup/sign-up-to-mergin-maps/index.md b/src/setup/sign-up-to-mergin-maps/index.md
index 6177d856..0f909566 100644
--- a/src/setup/sign-up-to-mergin-maps/index.md
+++ b/src/setup/sign-up-to-mergin-maps/index.md
@@ -6,13 +6,13 @@ outline: deep
 
 To make full use of <MainPlatformName />, you need to sign up. You can sign up using:
 - [Email and password](#email-and-password-sign-up)
-- [Single sign-on (SSO)](#single-sign-on-sso)
+- [Single sign-on (SSO)](#single-sign-on)
 
 ::: tip Manage your account
 Do you want to delete your account or change your details? Go to [**User Account**](../../manage/account/) for detailed steps.
 :::
 
-::: tip Account-less access
+::: warning Account-less access
 Public projects can be accessed and downloaded even without a <MainPlatformName /> account. However, to manage, share or upload changes to projects, you need to be signed in.
 :::
 
@@ -24,8 +24,11 @@ Password sign up to <MainPlatformName/> is available via <DashboardNameShort/> o
 
 1. Navigate to <AppDomainNameLink/>
 
-2. Fill in the registration form and click on **Sign Up**.
-   ![Mergin Maps sign up form](./mergin-web-sign-up.jpg "Mergin Maps sign up form")
+2. Use the **Sign Up** link to navigate to the registration form. 
+
+   Fill in the details and **Sign Up**.
+   
+   ![Mergin Maps sign up form](./dashboard-sign-up.jpg "Mergin Maps sign up form")
 
    While signing up, you can choose to receive information about updates and new features. You can unsubscribe from the <MainPlatformName /> newsletter anytime by clicking the **Unsubscribe** link at the bottom of the email.
   
@@ -104,30 +107,14 @@ You can get up-to-speed quickly by following our [Quick Start tutorials](../../t
    See our <MainDomainNameLink id="pricing" desc="pricing page"/> for more details.
    :::
 
-## Single sign-on (SSO)
-Single sign-on (SSO) is an authentication method that allows you to sign in to <MainPlatformName /> using the same credentials as you use in your organisation. 
-
-This means you don't have to create a new <MainPlatformName /> account with a specific password: you can simply use your work email. The identity provider (e.g. Microsoft Entra ID or Auth0) used by your organisation will check your credential and redirect you back to <MainPlatformName />.
-
-<MainPlatformName /> account will be created automatically after the first sign in via SSO.
-
-SSO is available on the <DashboardNameShort />, the <MobileAppNameShort /> and the <QGISPluginNameShort />.
+## Single sign-on
 
-### Connection setup
-If you are the admin or owner of a workspace and you want to set up SSO, please contact our <MainDomainNameLink id="contact-sales" desc="sales team"/>.
+If your organisation set up [SSO](../../manage/sso/) for <MainPlatformName />, you can sign in using the same credentials as you use in your organisation.
 
-You will receive a link with step-by-step guide for your identity provider. Currently, we support **SAML** and **OIDC** SSO protocols. Directory sync is not supported.
-
-::: tip SSO for self-hosted servers <ServerType type="EE" />
-If you want to use SSO on your <EnterprisePlatformNameLink /> server, you can do so from the admin panel. See [Single Sign-On Deployment](../../server/sso-deployment/) for more details.
-
-SSO is not available for <CommunityPlatformName />.
+::: tip
+You can find out more about this topic in [Single Sign-On (SSO)](../../manage/sso/).
 :::
 
-Once SSO is configured for your workspace, you will see the relevant information in the <DashboardLink id="settings" desc="workspace settings page"/>, under the *advanced* section. If you need to make any changes to your SSO connection, please <MerginMapsEmail id="support" desc="contact our support team"/>.
-
-![Mergin Maps workspace settings with enabled SSO](./dashboard-workspace-settings-sso.jpg "Mergin Maps workspace settings with enabled SSO")
-
 ### From dashboard
 To sign in or sign up to <MainPlatformName /> using SSO on the <DashboardShortLink />:
 1. Navigate to <AppDomainNameLink />
diff --git a/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.jpg b/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.jpg
deleted file mode 100644
index 797ae112..00000000
Binary files a/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.jpg and /dev/null differ
diff --git a/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.xcf b/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.xcf
deleted file mode 100644
index b7cfa53b..00000000
Binary files a/src/setup/sign-up-to-mergin-maps/mergin-web-sign-up.xcf and /dev/null differ
diff --git a/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.jpg b/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.jpg
index d9ff639e..cc3d1a06 100644
Binary files a/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.jpg and b/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.jpg differ
diff --git a/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.xcf b/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.xcf
index 21611219..5d47f1c0 100644
Binary files a/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.xcf and b/src/setup/sign-up-to-mergin-maps/mobile-app-sign-up.xcf differ
diff --git a/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.jpg b/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.jpg
index 6ee2f7ce..3798039b 100755
Binary files a/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.jpg and b/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.jpg differ
diff --git a/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.xcf b/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.xcf
index 682671af..7406abf5 100755
Binary files a/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.xcf and b/src/tutorials/opening-surveyed-data-on-your-computer/mergin-maps-mobile-log-in-to-mergin.xcf differ
diff --git a/src/tutorials/working-collaboratively/dashboard-sign-in.jpg b/src/tutorials/working-collaboratively/dashboard-sign-in.jpg
index 16423236..1fe62350 100644
Binary files a/src/tutorials/working-collaboratively/dashboard-sign-in.jpg and b/src/tutorials/working-collaboratively/dashboard-sign-in.jpg differ
diff --git a/src/tutorials/working-collaboratively/dashboard-sign-in.xcf b/src/tutorials/working-collaboratively/dashboard-sign-in.xcf
index 666551a1..8902931d 100644
Binary files a/src/tutorials/working-collaboratively/dashboard-sign-in.xcf and b/src/tutorials/working-collaboratively/dashboard-sign-in.xcf differ