diff --git a/backend/src/database/repositories/organizationCacheRepository.ts b/backend/src/database/repositories/organizationCacheRepository.ts
index 2956a2612c..972329be84 100644
--- a/backend/src/database/repositories/organizationCacheRepository.ts
+++ b/backend/src/database/repositories/organizationCacheRepository.ts
@@ -156,7 +156,7 @@ class OrganizationCacheRepository {
           replacements: {
             id,
             name: nameToCreateIdentity,
-            website: data.website,
+            website: data.website || null,
           },
           type: QueryTypes.INSERT,
           transaction,
diff --git a/backend/src/services/user/permissionChecker.ts b/backend/src/services/user/permissionChecker.ts
index c44e244767..63fafa80a2 100644
--- a/backend/src/services/user/permissionChecker.ts
+++ b/backend/src/services/user/permissionChecker.ts
@@ -136,9 +136,7 @@ export default class PermissionChecker {
       }
 
       // Third, for project admin, we need to check if the user is admin of all segments
-      return this.currentSegments.every((segment) =>
-        this.adminSegments.includes(segment.projectGroupId),
-      )
+      return this.currentSegments.every((segment) => this.adminSegments.includes(segment.id))
     })
   }
 
diff --git a/frontend/src/middleware/auth/segment-guard.js b/frontend/src/middleware/auth/segment-guard.js
index 579d5e1bd9..1e4ca4579c 100644
--- a/frontend/src/middleware/auth/segment-guard.js
+++ b/frontend/src/middleware/auth/segment-guard.js
@@ -1,4 +1,5 @@
-import { hasAccessToProjectGroup } from '@/utils/segments';
+import { hasAccessToProjectGroup, hasAccessToSegmentId } from '@/utils/segments';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 
 /**
  * Segment Guard
@@ -19,7 +20,19 @@ export default async function ({ to, store, router }) {
 
   await store.dispatch('auth/doWaitUntilInit');
 
-  if (!hasAccessToProjectGroup(to.params[to.meta.paramSegmentAccess])) {
+  const lsSegmentsStore = useLfSegmentsStore();
+  const isCheckingProjectGroup = to.meta.paramSegmentAccess.name === 'grandparent';
+  let hasPermission;
+
+  if (isCheckingProjectGroup) {
+    await lsSegmentsStore.listAdminProjectGroups();
+
+    hasPermission = hasAccessToProjectGroup(to.params[to.meta.paramSegmentAccess.parameter]);
+  } else {
+    hasPermission = hasAccessToSegmentId(to.params[to.meta.paramSegmentAccess.parameter]);
+  }
+
+  if (!hasPermission) {
     router.push('/403');
   }
 }
diff --git a/frontend/src/modules/dashboard/components/dashboard-project-group.vue b/frontend/src/modules/dashboard/components/dashboard-project-group.vue
index d95c186d3c..ecef8a2d63 100644
--- a/frontend/src/modules/dashboard/components/dashboard-project-group.vue
+++ b/frontend/src/modules/dashboard/components/dashboard-project-group.vue
@@ -1,63 +1,72 @@
 <template>
-  <img
-    v-if="isUrl(selectedProjectGroup.url)"
-    :src="selectedProjectGroup.url"
-    alt="Project group logo"
-    class="h-6 mb-3"
+  <div
+    v-if="loading"
+    v-loading="loading"
+    class="app-page-spinner h-16 !relative !min-h-5 mt-10"
   />
-  <div class="text-base font-semibold text-gray-900 mb-8 break-words">
-    {{ selectedProjectGroup.name }}
-  </div>
-
-  <div class="py-3">
-    <div class="text-2xs text-gray-400 mb-0.5">
-      Projects
+  <div v-else>
+    <img
+      v-if="isUrl(selectedProjectGroup.url)"
+      :src="selectedProjectGroup.url"
+      alt="Project group logo"
+      class="h-6 mb-3"
+    />
+    <div class="text-base font-semibold text-gray-900 mb-8 break-words">
+      {{ selectedProjectGroup.name }}
     </div>
-    <div class="text-xs text-gray-900">
-      {{ selectedProjectGroup.projects.length }}
+
+    <div class="py-3">
+      <div class="text-2xs text-gray-400 mb-0.5">
+        Projects
+      </div>
+      <div class="text-xs text-gray-900">
+        {{ selectedProjectGroup.projects.length }}
+      </div>
     </div>
-  </div>
 
-  <div class="mt-8">
-    <el-button
-      class="btn btn--md btn--secondary btn--full mb-4"
-      @click="isDrawerOpen = true"
-    >
-      Projects list
-    </el-button>
-    <router-link
-      v-if="hasPermissionToEditProject && hasAccessToProjectGroup(selectedProjectGroup.id)"
-      :to="{
-        name: 'adminProjects',
-        params: {
-          id: selectedProjectGroup.id,
-        },
-      }"
-    >
+    <div class="mt-8">
       <el-button
-        class="btn btn-link btn-link--md btn-link--primary btn--full"
+        class="btn btn--md btn--secondary btn--full mb-4"
+        @click="isDrawerOpen = true"
       >
-        <i class="ri-external-link-line" />
-        <span>Settings</span>
+        Projects list
       </el-button>
-    </router-link>
-  </div>
+      <router-link
+        v-if="hasPermissionToEditProject && hasAccessToProjectGroup(selectedProjectGroup.id)"
+        :to="{
+          name: 'adminProjects',
+          params: {
+            id: selectedProjectGroup.id,
+          },
+        }"
+      >
+        <el-button
+          class="btn btn-link btn-link--md btn-link--primary btn--full"
+        >
+          <i class="ri-external-link-line" />
+          <span>Settings</span>
+        </el-button>
+      </router-link>
+    </div>
 
-  <app-dashboard-project-group-drawer
-    v-if="isDrawerOpen"
-    v-model:is-visible="isDrawerOpen"
-    :project-group="selectedProjectGroup"
-  />
+    <app-dashboard-project-group-drawer
+      v-if="isDrawerOpen"
+      v-model:is-visible="isDrawerOpen"
+      :project-group="selectedProjectGroup"
+    />
+  </div>
 </template>
 
 <script setup>
 import { storeToRefs } from 'pinia';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import isUrl from '@/utils/isUrl';
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { hasAccessToProjectGroup } from '@/utils/segments';
+import { PermissionChecker } from '@/modules/user/permission-checker';
+import Roles from '@/security/roles';
 import AppDashboardProjectGroupDrawer from './dashboard-project-group-drawer.vue';
 
 const lsSegmentsStore = useLfSegmentsStore();
@@ -65,6 +74,8 @@ const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
 
 const isDrawerOpen = ref(false);
 
+const loading = ref(true);
+
 const { currentTenant, currentUser } = mapGetters('auth');
 
 const hasPermissionToEditProject = computed(
@@ -73,6 +84,25 @@ const hasPermissionToEditProject = computed(
     currentUser.value,
   ).editProject,
 );
+
+const isProjectAdminUser = computed(() => {
+  const permissionChecker = new PermissionChecker(
+    currentTenant.value,
+    currentUser.value,
+  );
+
+  return permissionChecker.currentUserRolesIds.includes(Roles.values.projectAdmin);
+});
+
+onMounted(() => {
+  if (isProjectAdminUser.value) {
+    lsSegmentsStore.listAdminProjectGroups().finally(() => {
+      loading.value = false;
+    });
+  } else {
+    loading.value = false;
+  }
+});
 </script>
 
 <script>
diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue
index c0560ba6f5..8c02af5f50 100644
--- a/frontend/src/modules/dashboard/pages/dashboard-page.vue
+++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue
@@ -43,7 +43,7 @@
     </div>
     <aside
       v-if="selectedProjectGroup"
-      class="border-l border-gray-200 overflow-auto px-5 py-6 h-screen"
+      class="border-l border-gray-200 overflow-auto px-5 py-6 h-screen min-w-[15rem]"
     >
       <cr-dashboard-upgrade-plan-widget v-if="displayUpgradeWidget" class="mb-10" />
       <app-dashboard-project-group />
diff --git a/frontend/src/modules/integration/integration-routes.js b/frontend/src/modules/integration/integration-routes.js
index e257638352..8c94fd0c95 100644
--- a/frontend/src/modules/integration/integration-routes.js
+++ b/frontend/src/modules/integration/integration-routes.js
@@ -1,6 +1,5 @@
 import Layout from '@/modules/layout/components/layout.vue';
 import Permissions from '@/security/permissions';
-import { hasAccessToProjectGroup } from '@/utils/segments';
 
 const IntegrationListPage = () => import(
   '@/modules/integration/components/integration-list-page.vue'
@@ -57,7 +56,10 @@ export default [
         meta: {
           auth: true,
           permission: Permissions.values.integrationRead,
-          paramSegmentAccess: 'grandparentId',
+          paramSegmentAccess: {
+            name: 'child',
+            parameter: 'id',
+          },
         },
       },
     ],
diff --git a/frontend/src/modules/lf/layout/components/lf-banners.vue b/frontend/src/modules/lf/layout/components/lf-banners.vue
index 1eeafbb3fe..16d8fbd43b 100644
--- a/frontend/src/modules/lf/layout/components/lf-banners.vue
+++ b/frontend/src/modules/lf/layout/components/lf-banners.vue
@@ -15,6 +15,7 @@
           <span class="font-semibold mx-1">{{ integrationsWithErrors[0]?.name }}</span>
           <span>has integrations with connectivity issues</span>
           <router-link
+            v-if="hasAccessToSegmentId(integrationsWithErrors[0].id)"
             :to="{
               name: 'integration',
               params: {
@@ -72,6 +73,7 @@
           <span class="font-semibold mx-1">{{ integrationsWithNoData[0]?.name }}</span>
           <span>has integrations that are not receiving activities</span>
           <router-link
+            v-if="hasAccessToSegmentId(integrationsWithNoData[0].id)"
             :to="{
               name: 'integration',
               params: {
@@ -163,7 +165,7 @@ import {
   watch, ref, computed, onUnmounted,
 } from 'vue';
 import { IntegrationService } from '@/modules/integration/integration-service';
-import { getSegmentsFromProjectGroup } from '@/utils/segments';
+import { getSegmentsFromProjectGroup, hasAccessToSegmentId } from '@/utils/segments';
 import { isCurrentDateAfterGivenWorkingDays } from '@/utils/date';
 import { CrowdIntegrations } from '@/integrations/integrations-config';
 import { useRoute } from 'vue-router';
diff --git a/frontend/src/modules/lf/layout/components/lf-menu-project-group-selection.vue b/frontend/src/modules/lf/layout/components/lf-menu-project-group-selection.vue
index da8884f596..68700a3bdf 100644
--- a/frontend/src/modules/lf/layout/components/lf-menu-project-group-selection.vue
+++ b/frontend/src/modules/lf/layout/components/lf-menu-project-group-selection.vue
@@ -110,7 +110,7 @@ const model = computed({
   },
 });
 
-const queryProjectGroups = () => {
+const queryProjectGroups = async () => {
   loading.value = true;
 
   return LfService.queryProjectGroups({
diff --git a/frontend/src/modules/lf/lf-routes.js b/frontend/src/modules/lf/lf-routes.js
index b892db30e1..1a3c3f46ac 100644
--- a/frontend/src/modules/lf/lf-routes.js
+++ b/frontend/src/modules/lf/lf-routes.js
@@ -1,6 +1,5 @@
 import Layout from '@/modules/layout/components/layout.vue';
 import Permissions from '@/security/permissions';
-import { hasAccessToProjectGroup } from '@/utils/segments';
 
 const ProjectGroupsListPage = () => import(
   '@/modules/lf/segments/pages/lf-project-groups-list-page.vue'
@@ -50,7 +49,10 @@ export default [
           auth: true,
           title: 'Admin Panel',
           permission: Permissions.values.projectEdit,
-          paramSegmentAccess: 'id',
+          paramSegmentAccess: {
+            name: 'grandparent',
+            parameter: 'id',
+          },
         },
       },
     ],
diff --git a/frontend/src/modules/lf/segments/components/form/lf-project-form.vue b/frontend/src/modules/lf/segments/components/form/lf-project-form.vue
index 682754d1e8..26bca882d4 100644
--- a/frontend/src/modules/lf/segments/components/form/lf-project-form.vue
+++ b/frontend/src/modules/lf/segments/components/form/lf-project-form.vue
@@ -120,6 +120,7 @@ import {
 import AppFormItem from '@/shared/form/form-item.vue';
 import statusOptions from '@/modules/lf/config/status';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
+import { useRoute } from 'vue-router';
 
 const emit = defineEmits(['update:modelValue']);
 const props = defineProps({
@@ -137,6 +138,8 @@ const props = defineProps({
   },
 });
 
+const route = useRoute();
+
 const lsSegmentsStore = useLfSegmentsStore();
 const {
   createProject,
@@ -218,7 +221,10 @@ const onSubmit = () => {
         model.value = false;
       });
   } else {
-    createProject(form)
+    createProject({
+      ...form,
+      segments: [route.params.id],
+    })
       .finally(() => {
         submitLoading.value = false;
         model.value = false;
diff --git a/frontend/src/modules/lf/segments/components/form/lf-sub-project-form.vue b/frontend/src/modules/lf/segments/components/form/lf-sub-project-form.vue
index 38dbc200d6..94ab17fc46 100644
--- a/frontend/src/modules/lf/segments/components/form/lf-sub-project-form.vue
+++ b/frontend/src/modules/lf/segments/components/form/lf-sub-project-form.vue
@@ -135,6 +135,10 @@ const props = defineProps({
     type: String,
     default: () => null,
   },
+  parentId: {
+    type: String,
+    default: () => null,
+  },
   grandparentSlug: {
     type: String,
     default: () => null,
@@ -224,7 +228,10 @@ const onSubmit = () => {
         model.value = false;
       });
   } else {
-    createSubProject(form)
+    createSubProject({
+      ...form,
+      segments: [props.parentId],
+    })
       .finally(() => {
         submitLoading.value = false;
         model.value = false;
diff --git a/frontend/src/modules/lf/segments/components/lf-project-groups-dropdown.vue b/frontend/src/modules/lf/segments/components/lf-project-groups-dropdown.vue
index 720cb48d49..e0117fc62f 100644
--- a/frontend/src/modules/lf/segments/components/lf-project-groups-dropdown.vue
+++ b/frontend/src/modules/lf/segments/components/lf-project-groups-dropdown.vue
@@ -14,7 +14,7 @@
       </button>
       <template #dropdown>
         <el-dropdown-item
-          v-if="hasPermissionToEditProjectGroup"
+          v-if="hasPermissionToEditProjectGroup && hasAccessToSegmentId(id)"
           class="h-10 mb-1"
           :command="editProjectGroup"
         >
@@ -24,7 +24,7 @@
           <span class="text-xs">Edit project group</span>
         </el-dropdown-item>
         <el-dropdown-item
-          v-if="hasPermissionToCreateProject"
+          v-if="hasPermissionToCreateProject && hasAccessToSegmentId(id)"
           class="h-10 mb-1"
           :command="addProject"
         >
@@ -33,7 +33,7 @@
           /><span class="text-xs">Add project</span>
         </el-dropdown-item>
         <el-divider
-          v-if="hasPermissionToEditProjectGroup || hasPermissionToCreateProject"
+          v-if="(hasPermissionToEditProjectGroup && hasAccessToSegmentId(id)) || (hasPermissionToCreateProject && hasAccessToSegmentId(id))"
           class="border-gray-200 !my-2"
         />
         <el-dropdown-item
@@ -56,6 +56,7 @@ import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { computed } from 'vue';
+import { hasAccessToSegmentId } from '@/utils/segments';
 
 const emit = defineEmits(['onEditProjectGroup', 'onAddProject']);
 
diff --git a/frontend/src/modules/lf/segments/components/lf-projects-dropdown.vue b/frontend/src/modules/lf/segments/components/lf-projects-dropdown.vue
index 3051326ed4..b5554603ae 100644
--- a/frontend/src/modules/lf/segments/components/lf-projects-dropdown.vue
+++ b/frontend/src/modules/lf/segments/components/lf-projects-dropdown.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="hasPermissionToCreateSubProject || hasPermissionToEditProject">
+  <div v-if="(hasPermissionToCreateSubProject && hasAccessToSegmentId(id)) || (hasPermissionToEditProject && hasAccessToSegmentId(id))">
     <el-dropdown
       trigger="click"
       placement="bottom-end"
@@ -14,7 +14,7 @@
       </button>
       <template #dropdown>
         <el-dropdown-item
-          v-if="hasPermissionToEditProject"
+          v-if="(hasPermissionToEditProject && hasAccessToSegmentId(id))"
           class="h-10 mb-1"
           :command="editProject"
         >
@@ -24,7 +24,7 @@
           <span class="text-xs">Edit project</span>
         </el-dropdown-item>
         <el-dropdown-item
-          v-if="hasPermissionToCreateSubProject"
+          v-if="(hasPermissionToCreateSubProject && hasAccessToSegmentId(id))"
           class="h-10"
           :command="addSubProject"
         >
@@ -41,6 +41,14 @@
 import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { computed } from 'vue';
+import { hasAccessToSegmentId } from '@/utils/segments';
+
+defineProps({
+  id: {
+    type: String,
+    default: null,
+  },
+});
 
 const emit = defineEmits(['onEditProject', 'onAddSubProject']);
 
diff --git a/frontend/src/modules/lf/segments/components/lf-sub-projects-dropdown.vue b/frontend/src/modules/lf/segments/components/lf-sub-projects-dropdown.vue
index 2c272b9ca9..eea8f83665 100644
--- a/frontend/src/modules/lf/segments/components/lf-sub-projects-dropdown.vue
+++ b/frontend/src/modules/lf/segments/components/lf-sub-projects-dropdown.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="hasPermissionToEditSubProject">
+  <div v-if="hasPermissionToEditSubProject && hasAccessToSegmentId(id)">
     <el-dropdown
       trigger="click"
       placement="bottom-end"
@@ -31,6 +31,14 @@
 import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { computed } from 'vue';
+import { hasAccessToSegmentId } from '@/utils/segments';
+
+defineProps({
+  id: {
+    type: String,
+    default: null,
+  },
+});
 
 const emit = defineEmits(['onEditSubProject']);
 
diff --git a/frontend/src/modules/lf/segments/components/view/lf-projects-table.vue b/frontend/src/modules/lf/segments/components/view/lf-projects-table.vue
index cd08827884..b0503d0ef3 100644
--- a/frontend/src/modules/lf/segments/components/view/lf-projects-table.vue
+++ b/frontend/src/modules/lf/segments/components/view/lf-projects-table.vue
@@ -109,13 +109,14 @@
         <span class="h-10 block" />
         <div class="flex justify-end mb-4">
           <app-lf-projects-dropdown
+            :id="project.id"
             @on-edit-project="emit('onEditProject', project.id)"
             @on-add-sub-project="emit('onAddSubProject', project.slug)"
           />
         </div>
       </template>
       <template #default="{ row }">
-        <div class="h-10 items-center flex justify-end gap-3">
+        <div v-if="hasAccessToSegmentId(row.id)" class="h-10 items-center flex justify-end gap-3">
           <router-link
             :to="{
               name: 'integration',
@@ -130,13 +131,14 @@
             </el-button>
           </router-link>
           <app-lf-sub-projects-dropdown
+            :id="row.id"
             @on-edit-sub-project="emit('onEditSubProject', row.id)"
           />
         </div>
       </template>
     </el-table-column>
 
-    <template v-if="project.subprojects?.length && hasPermissionToCreateSubProject" #append>
+    <template v-if="project.subprojects?.length && (hasPermissionToCreateSubProject && hasAccessToSegmentId(project.id))" #append>
       <div class="w-full flex justify-start p-6">
         <el-button class="btn btn-link btn-link--primary" @click="emit('onAddSubProject', project.slug)">
           + Add sub-project
@@ -144,7 +146,7 @@
       </div>
     </template>
 
-    <template v-if="hasPermissionToCreateSubProject" #empty>
+    <template v-if="(hasPermissionToCreateSubProject && hasAccessToSegmentId(project.id))" #empty>
       <div class="w-full flex justify-start p-6">
         <el-button class="btn btn-link btn-link--primary" @click="emit('onAddSubProject', project.slug)">
           + Add sub-project
@@ -163,6 +165,7 @@ import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
 import { computed } from 'vue';
 import AppPlatformSvg from '@/shared/modules/platform/components/platform-svg.vue';
+import { hasAccessToSegmentId } from '@/utils/segments';
 
 const route = useRoute();
 
diff --git a/frontend/src/modules/lf/segments/lf-segments-service.js b/frontend/src/modules/lf/segments/lf-segments-service.js
index 9332f4e16a..e1ba1a218e 100644
--- a/frontend/src/modules/lf/segments/lf-segments-service.js
+++ b/frontend/src/modules/lf/segments/lf-segments-service.js
@@ -10,7 +10,9 @@ export class LfService {
     const response = await authAxios.get(
       `/tenant/${tenantId}/segment/${id}`,
       {
-        excludeSegments: true,
+        params: {
+          segments: [id],
+        },
       },
     );
 
@@ -24,7 +26,7 @@ export class LfService {
       `/tenant/${tenantId}/segment/${id}`,
       {
         ...data,
-        excludeSegments: true,
+        segments: [id],
       },
     );
 
@@ -70,7 +72,7 @@ export class LfService {
       `/tenant/${tenantId}/segment/project/query`,
       {
         ...body,
-        excludeSegments: true,
+        ...(body.segments ? { segments: body.segments } : { excludeSegments: true }),
       },
     );
 
@@ -82,10 +84,7 @@ export class LfService {
 
     const response = await authAxios.post(
       `/tenant/${tenantId}/segment/project`,
-      {
-        ...body,
-        excludeSegments: true,
-      },
+      body,
     );
 
     return response.data;
@@ -98,10 +97,7 @@ export class LfService {
 
     const response = await authAxios.post(
       `/tenant/${tenantId}/segment/subproject`,
-      {
-        ...body,
-        excludeSegments: true,
-      },
+      body,
     );
 
     return response.data;
diff --git a/frontend/src/modules/lf/segments/pages/lf-project-groups-list-page.vue b/frontend/src/modules/lf/segments/pages/lf-project-groups-list-page.vue
index fd7a7bda59..0c5d7ec7e4 100644
--- a/frontend/src/modules/lf/segments/pages/lf-project-groups-list-page.vue
+++ b/frontend/src/modules/lf/segments/pages/lf-project-groups-list-page.vue
@@ -139,7 +139,7 @@ const { currentTenant, currentUser } = mapGetters('auth');
 const lsSegmentsStore = useLfSegmentsStore();
 const { projectGroups } = storeToRefs(lsSegmentsStore);
 const {
-  listProjectGroups, updateSelectedProjectGroup, searchProjectGroup,
+  listProjectGroups, updateSelectedProjectGroup, searchProjectGroup, listAdminProjectGroups,
 } = lsSegmentsStore;
 
 const activeTab = ref();
@@ -154,7 +154,8 @@ const isProjectAdminUser = computed(() => {
 });
 const adminOnly = computed(() => isProjectAdminUser.value && activeTab.value === 'project-groups');
 
-const loading = computed(() => projectGroups.value.loading);
+const loadingProjectAdmin = ref(true);
+const loading = computed(() => projectGroups.value.loading && loadingProjectAdmin.value);
 const pagination = computed(() => projectGroups.value.pagination);
 const list = computed(() => projectGroups.value.list);
 
@@ -212,6 +213,16 @@ const hasPermissionToCreateProjects = computed(
     currentUser.value,
   ).createProjectGroup,
 );
+
+onMounted(() => {
+  if (isProjectAdminUser.value) {
+    listAdminProjectGroups().finally(() => {
+      loadingProjectAdmin.value = false;
+    });
+  } else {
+    loadingProjectAdmin.value = false;
+  }
+});
 </script>
 
 <script>
diff --git a/frontend/src/modules/lf/segments/pages/lf-projects-page.vue b/frontend/src/modules/lf/segments/pages/lf-projects-page.vue
index ab9c577618..0f2b7d3481 100644
--- a/frontend/src/modules/lf/segments/pages/lf-projects-page.vue
+++ b/frontend/src/modules/lf/segments/pages/lf-projects-page.vue
@@ -22,7 +22,7 @@
         Manage projects
       </h4>
       <el-button
-        v-if="pagination.total && hasPermissionToCreate"
+        v-if="pagination.total && hasPermissionToCreate && hasAccessToSegmentId(route.params.id)"
         class="btn btn--md btn--primary"
         @click="onAddProject"
       >
@@ -49,8 +49,9 @@
         class="mt-20"
         icon="ri-stack-line"
         title="No projects yet"
-        description="Add your first project and start collecting data from your community"
-        :cta-btn="hasPermissionToCreate ? 'Add project' : null"
+        :description="`${!(hasPermissionToCreate && hasAccessToSegmentId(route.params.id))
+          ? 'Ask an administrator to a' : 'A'}dd your first project and start collecting data from your community`"
+        :cta-btn="hasPermissionToCreate && hasAccessToSegmentId(route.params.id) ? 'Add project' : null"
         @cta-click="onAddProject"
       />
 
@@ -108,6 +109,7 @@
       :id="subProjectForm.id"
       v-model="isSubProjectFormDrawerOpen"
       :parent-slug="projectForm.slug"
+      :parent-id="projectForm.id"
       :grandparent-slug="projectGroupForm.slug"
     />
   </app-page-wrapper>
@@ -126,6 +128,7 @@ import AppLfSearchInput from '@/modules/lf/segments/components/view/lf-search-in
 import { storeToRefs } from 'pinia';
 import { LfPermissions } from '@/modules/lf/lf-permissions';
 import { mapGetters } from '@/shared/vuex/vuex.helpers';
+import { hasAccessToSegmentId } from '@/utils/segments';
 
 const route = useRoute();
 const lsSegmentsStore = useLfSegmentsStore();
diff --git a/frontend/src/modules/lf/segments/store/actions.js b/frontend/src/modules/lf/segments/store/actions.js
index 0a4d954c61..e8d706d09f 100644
--- a/frontend/src/modules/lf/segments/store/actions.js
+++ b/frontend/src/modules/lf/segments/store/actions.js
@@ -60,6 +60,20 @@ export default {
         this.projectGroups.loading = false;
       });
   },
+  listAdminProjectGroups() {
+    return LfService.queryProjectGroups({
+      limit: null,
+      offset: 0,
+      filter: {
+        adminOnly: true,
+      },
+    })
+      .then((response) => {
+        this.adminProjectGroups.list = response.rows;
+        return Promise.resolve();
+      })
+      .catch(() => Promise.reject());
+  },
   findProjectGroup(id) {
     return LfService.findSegment(id)
       .then((projectGroup) => Promise.resolve(projectGroup))
diff --git a/frontend/src/modules/lf/segments/store/state.ts b/frontend/src/modules/lf/segments/store/state.ts
index 7d658e6b12..909346413d 100644
--- a/frontend/src/modules/lf/segments/store/state.ts
+++ b/frontend/src/modules/lf/segments/store/state.ts
@@ -2,6 +2,9 @@ import { ProjectGroup, Project } from '@/modules/lf/segments/types/Segments';
 
 export interface SegmentsState {
   selectedProjectGroup: ProjectGroup | null;
+  adminProjectGroups: {
+    list: ProjectGroups[],
+  }
   projectGroups: {
     list: ProjectGroup[],
     loading: boolean,
@@ -27,6 +30,9 @@ export interface SegmentsState {
 
 const state: SegmentsState = {
   selectedProjectGroup: null,
+  adminProjectGroups: {
+    list: [],
+  },
   projectGroups: {
     list: [],
     loading: true,
diff --git a/frontend/src/utils/segments.js b/frontend/src/utils/segments.js
index 35c2f83e83..2e0807c52b 100644
--- a/frontend/src/utils/segments.js
+++ b/frontend/src/utils/segments.js
@@ -1,6 +1,9 @@
 import { store } from '@/store';
 import { PermissionChecker } from '@/modules/user/permission-checker';
 import Roles from '@/security/roles';
+import { storeToRefs } from 'pinia';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
+import { LfService } from '@/modules/lf/segments/lf-segments-service';
 
 export const getSegmentsFromProjectGroup = (projectGroup, options) => {
   if (!projectGroup) {
@@ -41,5 +44,34 @@ export const hasAccessToProjectGroup = (segmentId) => {
     return false;
   }
 
+  const lsSegmentsStore = useLfSegmentsStore();
+  const { adminProjectGroups } = storeToRefs(lsSegmentsStore);
+
+  const segments = adminProjectGroups.value.list.map((p) => p.id);
+
+  return segments.includes(segmentId);
+};
+
+export const hasAccessToSegmentId = (segmentId) => {
+  const currentUser = store.getters['auth/currentUser'];
+  const currentTenant = store.getters['auth/currentTenant'];
+
+  const permissionChecker = new PermissionChecker(currentTenant, currentUser);
+
+  const isAdmin = permissionChecker.currentUserRolesIds.includes(
+    Roles.values.admin,
+  );
+
+  if (isAdmin) {
+    return true;
+  }
+
+  const tenant = currentUser.tenants.find((t) => t.tenantId === currentTenant.id);
+  const { adminSegments = [] } = tenant;
+
+  if (!adminSegments.length) {
+    return false;
+  }
+
   return adminSegments.includes(segmentId);
 };
diff --git a/services/apps/entity_merging_worker/src/activities/members.ts b/services/apps/entity_merging_worker/src/activities/members.ts
index 152142738a..816881c87e 100644
--- a/services/apps/entity_merging_worker/src/activities/members.ts
+++ b/services/apps/entity_merging_worker/src/activities/members.ts
@@ -22,6 +22,20 @@ export async function moveActivitiesBetweenMembers(
   secondaryId: string,
   tenantId: string,
 ): Promise<void> {
+  const memberExists = await svc.postgres.writer.connection().oneOrNone(
+    `
+      SELECT id
+      FROM members
+      WHERE id = $1
+        AND "tenantId" = $2
+    `,
+    [primaryId, tenantId],
+  )
+
+  if (!memberExists) {
+    return
+  }
+
   await svc.postgres.writer.connection().query(
     `
       UPDATE activities
diff --git a/services/apps/entity_merging_worker/src/activities/organizations.ts b/services/apps/entity_merging_worker/src/activities/organizations.ts
index 477bd812d0..da8f401ba1 100644
--- a/services/apps/entity_merging_worker/src/activities/organizations.ts
+++ b/services/apps/entity_merging_worker/src/activities/organizations.ts
@@ -3,6 +3,13 @@ import { svc } from '../main'
 import { ApiWebsocketMessage } from '@crowd/types'
 
 export async function deleteOrganization(organizationId: string): Promise<void> {
+  await svc.postgres.writer.connection().query(
+    `
+      DELETE FROM "organizationCacheLinks"
+      WHERE "organizationId" = $1
+    `,
+    [organizationId],
+  )
   await svc.postgres.writer.connection().query(
     `
       DELETE FROM "organizationSegments"
diff --git a/services/libs/common/src/emailDomainValidator.ts b/services/libs/common/src/emailDomainValidator.ts
index 45c1b0248f..a9552ff788 100644
--- a/services/libs/common/src/emailDomainValidator.ts
+++ b/services/libs/common/src/emailDomainValidator.ts
@@ -108,6 +108,7 @@ const blacklistedDomains = [
   '126.com',
   '163.com',
   'foxmail.com',
+  'groups.io',
 ]
 
 /**
diff --git a/services/libs/integrations/src/integrations/activityTypes.ts b/services/libs/integrations/src/integrations/activityTypes.ts
index a5e8d7a8cd..e7470ff2e4 100644
--- a/services/libs/integrations/src/integrations/activityTypes.ts
+++ b/services/libs/integrations/src/integrations/activityTypes.ts
@@ -831,21 +831,6 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
     },
   },
   [PlatformType.GERRIT]: {
-    [GerritActivityType.CHANGESET_NEW]: {
-      display: {
-        default: 'Created a gerrit changeset in {channel}',
-        short: 'created a changeset',
-        channel: '{channel}',
-        formatter: {
-          channel: defaultGerritChannelFormatter,
-          self: (activity) => {
-            const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent?.title}`
-            return `<a href="${activity.url}" target="_blank">${prNumberAndTitle}</a>`
-          },
-        },
-      },
-      isContribution: true,
-    },
     [GerritActivityType.CHANGESET_CREATED]: {
       display: {
         default: 'Created a gerrit changeset in {channel}',
diff --git a/services/libs/opensearch/src/memberTranslator.ts b/services/libs/opensearch/src/memberTranslator.ts
index c47faf6099..ace36e913e 100644
--- a/services/libs/opensearch/src/memberTranslator.ts
+++ b/services/libs/opensearch/src/memberTranslator.ts
@@ -74,6 +74,7 @@ export default class MemberTranslator extends FieldTranslator {
     this.translations.title = 'string_title'
     this.translations.dateStart = 'date_dateStart'
     this.translations.dateEnd = 'date_dateEnd'
+    this.translations.source = 'string_source'
 
     // identities
     this.translations.platform = 'string_platform'
diff --git a/services/libs/opensearch/src/repo/member.data.ts b/services/libs/opensearch/src/repo/member.data.ts
index bba7a5eb3e..08e2cf365f 100644
--- a/services/libs/opensearch/src/repo/member.data.ts
+++ b/services/libs/opensearch/src/repo/member.data.ts
@@ -30,6 +30,7 @@ export interface IDbMemberOrganization {
     title: string
     dateStart: string
     dateEnd: string
+    source?: string
   }
 }
 
diff --git a/services/libs/opensearch/src/repo/member.repo.ts b/services/libs/opensearch/src/repo/member.repo.ts
index eb9026c3e4..1bb681c8d8 100644
--- a/services/libs/opensearch/src/repo/member.repo.ts
+++ b/services/libs/opensearch/src/repo/member.repo.ts
@@ -405,6 +405,7 @@ export class MemberRepository extends RepositoryBase<MemberRepository> {
                           'memberOrganizations', json_build_object(
                                         'dateStart', mo."dateStart",
                                         'dateEnd', mo."dateEnd",
+                                        'source', mo."source",
                                         'title', mo.title
                           )
                       )
diff --git a/services/libs/opensearch/src/service/member.sync.service.ts b/services/libs/opensearch/src/service/member.sync.service.ts
index bfd9cabb99..53de1f5962 100644
--- a/services/libs/opensearch/src/service/member.sync.service.ts
+++ b/services/libs/opensearch/src/service/member.sync.service.ts
@@ -764,6 +764,7 @@ export class MemberSyncService {
           string_title: organization.memberOrganizations?.title || null,
           date_dateStart: organization.memberOrganizations?.dateStart || null,
           date_dateEnd: organization.memberOrganizations?.dateEnd || null,
+          string_source: organization.memberOrganizations?.source || null,
         },
       })
     }