diff --git a/apps/console/src/components/tasks/TasksCard.tsx b/apps/console/src/components/tasks/TasksCard.tsx
index b9f8f27f3e..82e0b41281 100644
--- a/apps/console/src/components/tasks/TasksCard.tsx
+++ b/apps/console/src/components/tasks/TasksCard.tsx
@@ -648,12 +648,7 @@ function TaskRow(props: TaskRowProps) {
         </div>
         {task.assignedTo?.fullName && (
           <div className="text-sm text-txt-secondary ml-auto mr-8">
-            <Link
-              className="hover:underline"
-              to={`/organizations/${organizationId}/people/${task.assignedTo.id}`}
-            >
-              {task.assignedTo.fullName}
-            </Link>
+            {task.assignedTo.fullName}
           </div>
         )}
         <div className="flex gap-2 items-center">
diff --git a/apps/console/src/pages/iam/organizations/_components/Sidebar.tsx b/apps/console/src/pages/iam/organizations/_components/Sidebar.tsx
index 1725fbb008..55f1c398ea 100644
--- a/apps/console/src/pages/iam/organizations/_components/Sidebar.tsx
+++ b/apps/console/src/pages/iam/organizations/_components/Sidebar.tsx
@@ -20,7 +20,6 @@ import {
   IconBox,
   IconCircleProgress,
   IconFire3,
-  IconGroup1,
   IconInboxEmpty,
   IconKey,
   IconListStack,
@@ -122,13 +121,6 @@ export function Sidebar(props: { fKey: SidebarFragment$key }) {
           to={`${prefix}/frameworks`}
         />
       )}
-      {organization.canListMembers && (
-        <SidebarItem
-          label={__("People")}
-          icon={IconGroup1}
-          to={`${prefix}/people`}
-        />
-      )}
       {organization.canListThirdParties && (
         <SidebarItem
           label={__("Third parties")}
@@ -220,9 +212,9 @@ export function Sidebar(props: { fKey: SidebarFragment$key }) {
           to={`${prefix}/cookie-banners`}
         />
       )}
-      {organization.canUpdateOrganization && (
+      {(organization.canUpdateOrganization || organization.canListMembers) && (
         <SidebarItem
-          label={__("Settings")}
+          label={__("Organization")}
           icon={IconSettingsGear2}
           to={`${prefix}/settings`}
         />
diff --git a/apps/console/src/pages/iam/organizations/people/PersonPage.tsx b/apps/console/src/pages/iam/organizations/people/PersonPage.tsx
deleted file mode 100644
index 6dbfbc3575..0000000000
--- a/apps/console/src/pages/iam/organizations/people/PersonPage.tsx
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) 2026 Probo Inc <hello@probo.com>.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-import { sprintf } from "@probo/helpers";
-import { useTranslate } from "@probo/i18n";
-import { ActionDropdown, Avatar, Badge, Breadcrumb, Card, DropdownItem, IconArchive, IconTrashCan, useConfirm } from "@probo/ui";
-import { type PreloadedQuery, usePreloadedQuery } from "react-relay";
-import { useNavigate } from "react-router";
-import { graphql } from "relay-runtime";
-
-import type { PersonPageQuery } from "#/__generated__/iam/PersonPageQuery.graphql";
-import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
-import { useOrganizationId } from "#/hooks/useOrganizationId";
-
-import { PersonFormLoader } from "./_components/PersonForm";
-
-export const personPageQuery = graphql`
-  query PersonPageQuery($personId: ID!) {
-    person: node(id: $personId) @required(action: THROW) {
-      __typename
-      ... on Profile {
-        id
-        fullName
-        emailAddress
-        source
-        state
-        canDelete: permission(action: "iam:membership-profile:delete")
-        ...PersonFormFragment
-      }
-    }
-  }
-`;
-
-const removeUserMutation = graphql`
-  mutation PersonPage_removeMutation(
-    $input: RemoveUserInput!
-  ) {
-    removeUser(input: $input) {
-      deletedProfileId
-    }
-  }
-`;
-
-const archiveUserMutation = graphql`
-  mutation PersonPage_archiveMutation(
-    $input: ArchiveUserInput!
-  ) {
-    archiveUser(input: $input) {
-      archivedProfileId
-    }
-  }
-`;
-
-export function PersonPage(props: { queryRef: PreloadedQuery<PersonPageQuery> }) {
-  const { queryRef } = props;
-
-  const organizationId = useOrganizationId();
-  const { __ } = useTranslate();
-  const confirm = useConfirm();
-  const navigate = useNavigate();
-
-  const { person } = usePreloadedQuery<PersonPageQuery>(personPageQuery, queryRef);
-  if (person.__typename !== "Profile") {
-    throw new Error("invalid type for node");
-  }
-
-  const [archiveUser, isArchiving] = useMutationWithToasts(
-    archiveUserMutation,
-    {
-      successMessage: __("Person archived successfully"),
-      errorMessage: __("Failed to archive person"),
-    },
-  );
-  const [removeUser, isRemoving] = useMutationWithToasts(
-    removeUserMutation,
-    {
-      successMessage: __("Person removed successfully"),
-      errorMessage: __("Failed to remove person"),
-    },
-  );
-  const isMutating = isArchiving || isRemoving;
-
-  const handleArchive = () => {
-    confirm(
-      () => {
-        return archiveUser({
-          variables: {
-            input: {
-              profileId: person.id,
-              organizationId: organizationId,
-            },
-          },
-          onCompleted: () => {
-            void navigate(`/organizations/${organizationId}/people`);
-          },
-        });
-      },
-      {
-        message: sprintf(
-          __("Are you sure you want to archive %s?"),
-          person.fullName,
-        ),
-      },
-    );
-  };
-
-  const handleRemove = () => {
-    confirm(
-      () => {
-        return removeUser({
-          variables: {
-            input: {
-              profileId: person.id,
-              organizationId: organizationId,
-            },
-          },
-          onCompleted: () => {
-            void navigate(`/organizations/${organizationId}/people`);
-          },
-        });
-      },
-      {
-        message: sprintf(
-          __("Are you sure you want to remove %s?"),
-          person.fullName,
-        ),
-      },
-    );
-  };
-
-  const canArchive = person.canDelete && person.source !== "SCIM" && person.state !== "INACTIVE";
-  const canRemove = person.canDelete && person.source !== "SCIM";
-
-  return (
-    <div className="space-y-6">
-      <Breadcrumb
-        items={[
-          {
-            label: __("People"),
-            to: `/organizations/${organizationId}/people`,
-          },
-          {
-            label: person.fullName,
-          },
-        ]}
-      />
-      <div className="flex justify-between">
-        <div className="flex items-center gap-6">
-          <Avatar name={person.fullName} size="xl" />
-          <div>
-            <div className="flex items-center gap-2">
-              <span className="text-2xl">{person.fullName}</span>
-              <Badge variant="info">{person.source}</Badge>
-            </div>
-            <div className="text-lg text-txt-secondary">{person.emailAddress}</div>
-          </div>
-        </div>
-        {(canArchive || canRemove) && (
-          <ActionDropdown variant="secondary">
-            {canArchive && (
-              <DropdownItem
-                icon={IconArchive}
-                onClick={handleArchive}
-                disabled={isMutating}
-              >
-                {__("Archive")}
-              </DropdownItem>
-            )}
-            {canRemove && (
-              <DropdownItem
-                variant="danger"
-                icon={IconTrashCan}
-                onClick={handleRemove}
-                disabled={isMutating}
-              >
-                {__("Remove")}
-              </DropdownItem>
-            )}
-          </ActionDropdown>
-        )}
-      </div>
-
-      <Card padded className="space-y-4">
-        <PersonFormLoader fragmentRef={person} />
-      </Card>
-    </div>
-  );
-};
diff --git a/apps/console/src/pages/iam/organizations/people/_components/PersonForm.tsx b/apps/console/src/pages/iam/organizations/people/_components/PersonForm.tsx
deleted file mode 100644
index 45a86d8cf8..0000000000
--- a/apps/console/src/pages/iam/organizations/people/_components/PersonForm.tsx
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright (c) 2026 Probo Inc <hello@probo.com>.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-import { formatDatetime, getAssignableRoles, getRoles } from "@probo/helpers";
-import { roles } from "@probo/helpers/src/roles";
-import { useTranslate } from "@probo/i18n";
-import { Button, Field, Input, Option } from "@probo/ui";
-import { use } from "react";
-import { useWatch } from "react-hook-form";
-import { useFragment } from "react-relay";
-import { type DataID, graphql } from "relay-runtime";
-import { z } from "zod";
-
-import type { PersonForm_createMutation } from "#/__generated__/iam/PersonForm_createMutation.graphql";
-import type { PersonForm_updateMutation } from "#/__generated__/iam/PersonForm_updateMutation.graphql";
-import type { PersonFormFragment$key } from "#/__generated__/iam/PersonFormFragment.graphql";
-import { ControlledField } from "#/components/form/ControlledField";
-import { EmailsField } from "#/components/form/EmailsField";
-import { useFormWithSchema } from "#/hooks/useFormWithSchema";
-import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
-import { useOrganizationId } from "#/hooks/useOrganizationId";
-import { CurrentUser } from "#/providers/CurrentUser";
-
-const fragment = graphql`
-  fragment PersonFormFragment on Profile {
-    id
-    fullName
-    emailAddress
-    source
-    membership @required(action: THROW) {
-      role
-    }
-    kind
-    position
-    additionalEmailAddresses
-    contractStartDate
-    contractEndDate
-    canUpdate: permission(action: "iam:membership-profile:update")
-  }
-`;
-
-const createPersonMutation = graphql`
-  mutation PersonForm_createMutation($input: CreateUserInput! $connections: [ID!]!) {
-    createUser(input: $input) {
-      profileEdge @prependEdge(connections: $connections) {
-        node {
-          ...PeopleListItemFragment
-        }
-      }
-    }
-  }
-`;
-
-const updatePersonMutation = graphql`
-  mutation PersonForm_updateMutation($input: UpdateUserInput!) {
-    updateUser(input: $input) {
-      profile {
-        id
-      }
-    }
-  }
-`;
-
-const schema = z.object({
-  fullName: z.string().min(1),
-  emailAddress: z.string().email(),
-  role: z.enum(roles),
-  position: z.string().min(1).optional().nullable(),
-  additionalEmailAddresses: z.preprocess(
-    // Empty additional emails are skipped
-    v => (v as string[]).filter(v => !!v),
-    z.array(z.string().email()),
-  ),
-  kind: z.string().min(1).optional().nullable(),
-  contractStartDate: z.string().optional().nullable(),
-  contractEndDate: z.string().optional().nullable(),
-});
-
-export function PersonForm(props: {
-  id?: string;
-  connectionId?: DataID;
-  disabled?: boolean;
-  scimManaged?: boolean;
-  defaultValues?: z.infer<typeof schema>;
-  onSubmit?: () => void;
-}) {
-  const {
-    id,
-    connectionId = "",
-    disabled = false,
-    scimManaged = false,
-    defaultValues = {
-      fullName: "",
-      emailAddress: "",
-      role: "EMPLOYEE",
-      additionalEmailAddresses: [],
-      kind: "EMPLOYEE",
-      position: null,
-      contractStartDate: null,
-      contractEndDate: null,
-    },
-    onSubmit,
-  } = props;
-
-  const organizationId = useOrganizationId();
-  const { __ } = useTranslate();
-  const { role } = use(CurrentUser);
-  const availableRoles = getAssignableRoles(role);
-
-  const { control, formState, handleSubmit: handleSubmitWrapper, register, reset }
-    = useFormWithSchema(schema, { defaultValues });
-  const watchedRole = useWatch({
-    control,
-    name: "role",
-    defaultValue: "EMPLOYEE",
-  });
-  const [createPerson, isCreating] = useMutationWithToasts<PersonForm_createMutation>(
-    createPersonMutation,
-    {
-      successMessage: __("Person created successfully."),
-      errorMessage: __("Failed to create person"),
-    },
-  );
-  const [updatePerson, isUpdating] = useMutationWithToasts<PersonForm_updateMutation>(
-    updatePersonMutation,
-    {
-      successMessage: __("Person updated successfully."),
-      errorMessage: __("Failed to update person"),
-    },
-  );
-  const handleSubmit = handleSubmitWrapper(async (data: z.infer<typeof schema>) => {
-    const sharedInput = {
-      fullName: data.fullName,
-      additionalEmailAddresses: data.additionalEmailAddresses,
-      kind: data.kind,
-      position: data.position,
-      contractStartDate: formatDatetime(data.contractStartDate) ?? null,
-      contractEndDate: formatDatetime(data.contractEndDate) ?? null,
-    };
-
-    if (id) {
-      await updatePerson({
-        variables: { input: { ...sharedInput, id } },
-        onCompleted: () => {
-          reset(data);
-          onSubmit?.();
-        },
-      });
-    } else {
-      await createPerson({
-        variables: {
-          input: {
-            ...sharedInput,
-            emailAddress: data.emailAddress,
-            role: data.role,
-            organizationId,
-          },
-          connections: [connectionId],
-        },
-        onCompleted: () => {
-          reset(data);
-          onSubmit?.();
-        },
-      });
-    }
-  });
-
-  return (
-    <form onSubmit={e => void handleSubmit(e)} className="space-y-4">
-      <Field label={__("Full name *")} {...register("fullName")} type="text" disabled={disabled || scimManaged} />
-      {id
-        ? (
-            <>
-              <input type="hidden" {...register("emailAddress")} disabled />
-              <input type="hidden" {...register("role")} disabled />
-            </>
-          )
-        : (
-            <>
-              <Field label={__("Email Address *")} {...register("emailAddress")} type="email" disabled={disabled || !!id} />
-              <ControlledField
-                control={control}
-                name="role"
-                type="select"
-                label={__("Role *")}
-                disabled={disabled || !!id}
-              >
-                {availableRoles.includes("OWNER") && (
-                  <Option value="OWNER">{__("Owner")}</Option>
-                )}
-                {availableRoles.includes("ADMIN") && (
-                  <Option value="ADMIN">{__("Admin")}</Option>
-                )}
-                {availableRoles.includes("VIEWER") && (
-                  <Option value="VIEWER">{__("Viewer")}</Option>
-                )}
-                {availableRoles.includes("AUDITOR") && (
-                  <Option value="AUDITOR">{__("Auditor")}</Option>
-                )}
-                {availableRoles.includes("EMPLOYEE") && (
-                  <Option value="EMPLOYEE">{__("Employee")}</Option>
-                )}
-              </ControlledField>
-
-              <div className="mt-4 space-y-2 text-sm text-txt-tertiary">
-                {watchedRole === "OWNER" && (
-                  <p>{__("Full access to everything")}</p>
-                )}
-                {watchedRole === "ADMIN" && (
-                  <p>
-                    {__("Full access except organization setup and API keys")}
-                  </p>
-                )}
-                {watchedRole === "VIEWER" && <p>{__("Read-only access")}</p>}
-                {watchedRole === "AUDITOR" && (
-                  <p>
-                    {__("Read-only access without settings and tasks")}
-                  </p>
-                )}
-                {watchedRole === "EMPLOYEE" && (
-                  <p>{__("Access to employee page")}</p>
-                )}
-              </div>
-            </>
-          )}
-      <ControlledField
-        control={control}
-        name="kind"
-        type="select"
-        label={__("Type")}
-        disabled={disabled || scimManaged}
-      >
-        {getRoles(__).map(role => (
-          <Option key={role.value} value={role.value}>
-            {role.label}
-          </Option>
-        ))}
-      </ControlledField>
-      <Field
-        label={__("Position")}
-        {...register("position")}
-        type="text"
-        placeholder={__("e.g. CEO, CFO, etc.")}
-        disabled={disabled || scimManaged}
-      />
-      <EmailsField control={control} register={register} disabled={disabled || scimManaged} />
-      <Field label={__("Contract start date")}>
-        <Input
-          {...register("contractStartDate")}
-          type="date"
-          disabled={disabled}
-        />
-      </Field>
-      <Field label={__("Contract end date")}>
-        <Input
-          {...register("contractEndDate")}
-          type="date"
-          disabled={disabled}
-        />
-      </Field>
-      <div className="flex justify-end">
-        {(!id || formState.isDirty) && !disabled && (
-          <Button type="submit" disabled={isUpdating || isCreating || !formState.isValid}>
-            {id ? __("Update") : __("Create")}
-          </Button>
-        )}
-      </div>
-    </form>
-  );
-}
-
-export function PersonFormLoader(props: { fragmentRef: PersonFormFragment$key }) {
-  const { fragmentRef } = props;
-
-  const person = useFragment<PersonFormFragment$key>(fragment, fragmentRef);
-
-  return (
-    <PersonForm
-      id={person.id}
-      disabled={!person.canUpdate}
-      scimManaged={person.source === "SCIM"}
-      defaultValues={
-        {
-          kind: person.kind,
-          fullName: person.fullName,
-          emailAddress: person.emailAddress,
-          role: person.membership.role,
-          position: person.position,
-          additionalEmailAddresses: [...person.additionalEmailAddresses],
-          contractStartDate: person.contractStartDate?.split("T")[0] || "",
-          contractEndDate: person.contractEndDate?.split("T")[0] || "",
-        }
-      }
-    />
-  );
-}
diff --git a/apps/console/src/pages/iam/organizations/people/routes.ts b/apps/console/src/pages/iam/organizations/people/routes.ts
deleted file mode 100644
index cb21363324..0000000000
--- a/apps/console/src/pages/iam/organizations/people/routes.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2026 Probo Inc <hello@probo.com>.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-import { lazy } from "@probo/react-lazy";
-
-import { LinkCardSkeleton } from "#/components/skeletons/LinkCardSkeleton";
-
-export const peopleRoutes = [
-  {
-    path: "people",
-    children: [
-      {
-        index: true,
-        Component: lazy(() => import("#/pages/iam/organizations/people/PeoplePageLoader")),
-        Fallback: LinkCardSkeleton,
-      },
-      {
-        path: ":personId",
-        Component: lazy(() => import("#/pages/iam/organizations/people/PersonPageLoader")),
-        Fallback: LinkCardSkeleton,
-      },
-    ],
-  },
-];
diff --git a/apps/console/src/pages/iam/organizations/people/PeoplePage.tsx b/apps/console/src/pages/iam/organizations/settings/MembersSettingsPage.tsx
similarity index 62%
rename from apps/console/src/pages/iam/organizations/people/PeoplePage.tsx
rename to apps/console/src/pages/iam/organizations/settings/MembersSettingsPage.tsx
index a1df1cd76e..46d646dad0 100644
--- a/apps/console/src/pages/iam/organizations/people/PeoplePage.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/MembersSettingsPage.tsx
@@ -13,32 +13,32 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 import { useTranslate } from "@probo/i18n";
-import { Button, PageHeader } from "@probo/ui";
+import { Button } from "@probo/ui";
 import { useState } from "react";
 import { type PreloadedQuery, usePreloadedQuery } from "react-relay";
 import { ConnectionHandler, type DataID, graphql } from "relay-runtime";
 
-import type { PeoplePageQuery } from "#/__generated__/iam/PeoplePageQuery.graphql";
+import type { MembersSettingsPageQuery } from "#/__generated__/iam/MembersSettingsPageQuery.graphql";
 import { useOrganizationId } from "#/hooks/useOrganizationId";
 
-import { AddPersonDialog } from "./_components/AddPersonDialog";
-import { PeopleList } from "./_components/PeopleList";
+import { AddMemberDialog } from "./_components/AddMemberDialog";
+import { MembersList } from "./_components/MembersList";
 
-export const peoplePageQuery = graphql`
-  query PeoplePageQuery($organizationId: ID!) {
+export const membersSettingsPageQuery = graphql`
+  query MembersSettingsPageQuery($organizationId: ID!) {
     organization: node(id: $organizationId) @required(action: THROW) {
       __typename
       ... on Organization {
         canCreateUser: permission(action: "iam:membership-profile:create")
-        ...PeopleListFragment
-          @arguments(first: 20, order: { direction: ASC, field: FULL_NAME })
+        ...MembersListFragment
+          @arguments(first: 20, order: { direction: ASC, field: EMAIL_ADDRESS })
       }
     }
   }
 `;
 
-export function PeoplePage(props: {
-  queryRef: PreloadedQuery<PeoplePageQuery>;
+export function MembersSettingsPage(props: {
+  queryRef: PreloadedQuery<MembersSettingsPageQuery>;
 }) {
   const { queryRef } = props;
 
@@ -48,13 +48,13 @@ export function PeoplePage(props: {
   const [connectionId, setConnectionId] = useState<DataID>(
     ConnectionHandler.getConnectionID(
       organizationId,
-      "PeopleListFragment_profiles",
-      { orderBy: { direction: "ASC", field: "FULL_NAME" } },
+      "MembersListFragment_profiles",
+      { orderBy: { direction: "ASC", field: "EMAIL_ADDRESS" } },
     ),
   );
 
-  const { organization } = usePreloadedQuery<PeoplePageQuery>(
-    peoplePageQuery,
+  const { organization } = usePreloadedQuery<MembersSettingsPageQuery>(
+    membersSettingsPageQuery,
     queryRef,
   );
   if (organization.__typename !== "Organization") {
@@ -63,21 +63,18 @@ export function PeoplePage(props: {
 
   return (
     <div className="space-y-6">
-      <PageHeader title={__("People")}>
-        {organization.canCreateUser
-          && (
-            <AddPersonDialog connectionId={connectionId}>
-              <Button variant="secondary">{__("Add Person")}</Button>
-            </AddPersonDialog>
-          )}
-      </PageHeader>
+      {organization.canCreateUser && (
+        <div className="flex justify-end">
+          <AddMemberDialog connectionId={connectionId}>
+            <Button variant="secondary">{__("Add member")}</Button>
+          </AddMemberDialog>
+        </div>
+      )}
 
-      <div className="pb-6 pt-6">
-        <PeopleList
-          fKey={organization}
-          onConnectionIdChange={setConnectionId}
-        />
-      </div>
+      <MembersList
+        fKey={organization}
+        onConnectionIdChange={setConnectionId}
+      />
     </div>
   );
 }
diff --git a/apps/console/src/pages/iam/organizations/people/PeoplePageLoader.tsx b/apps/console/src/pages/iam/organizations/settings/MembersSettingsPageLoader.tsx
similarity index 73%
rename from apps/console/src/pages/iam/organizations/people/PeoplePageLoader.tsx
rename to apps/console/src/pages/iam/organizations/settings/MembersSettingsPageLoader.tsx
index c96a791214..76967d39f9 100644
--- a/apps/console/src/pages/iam/organizations/people/PeoplePageLoader.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/MembersSettingsPageLoader.tsx
@@ -15,16 +15,16 @@
 import { useEffect } from "react";
 import { useQueryLoader } from "react-relay";
 
-import type { PeoplePageQuery } from "#/__generated__/iam/PeoplePageQuery.graphql";
+import type { MembersSettingsPageQuery } from "#/__generated__/iam/MembersSettingsPageQuery.graphql";
 import { useOrganizationId } from "#/hooks/useOrganizationId";
 import { IAMRelayProvider } from "#/providers/IAMRelayProvider";
 
-import { PeoplePage, peoplePageQuery } from "./PeoplePage";
+import { MembersSettingsPage, membersSettingsPageQuery } from "./MembersSettingsPage";
 
-function PeoplePageQueryLoader() {
+function MembersSettingsPageQueryLoader() {
   const organizationId = useOrganizationId();
   const [queryRef, loadQuery]
-    = useQueryLoader<PeoplePageQuery>(peoplePageQuery);
+    = useQueryLoader<MembersSettingsPageQuery>(membersSettingsPageQuery);
 
   useEffect(() => {
     loadQuery({
@@ -36,13 +36,13 @@ function PeoplePageQueryLoader() {
     return null;
   }
 
-  return <PeoplePage queryRef={queryRef} />;
+  return <MembersSettingsPage queryRef={queryRef} />;
 }
 
-export default function PeoplePageLoader() {
+export default function MembersSettingsPageLoader() {
   return (
     <IAMRelayProvider>
-      <PeoplePageQueryLoader />
+      <MembersSettingsPageQueryLoader />
     </IAMRelayProvider>
   );
 }
diff --git a/apps/console/src/pages/iam/organizations/settings/SettingsLayout.tsx b/apps/console/src/pages/iam/organizations/settings/SettingsLayout.tsx
index ea06a8c19f..46163fae73 100644
--- a/apps/console/src/pages/iam/organizations/settings/SettingsLayout.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/SettingsLayout.tsx
@@ -14,6 +14,7 @@
 
 import { useTranslate } from "@probo/i18n";
 import {
+  IconGroup1,
   IconKey,
   IconListStack,
   IconLock,
@@ -23,39 +24,90 @@ import {
   TabLink,
   Tabs,
 } from "@probo/ui";
+import { type PreloadedQuery, useFragment, usePreloadedQuery } from "react-relay";
 import { Outlet } from "react-router";
+import { graphql } from "relay-runtime";
 
+import type { SettingsLayoutFragment$key } from "#/__generated__/iam/SettingsLayoutFragment.graphql";
+import type { SettingsLayoutQuery } from "#/__generated__/iam/SettingsLayoutQuery.graphql";
 import { useOrganizationId } from "#/hooks/useOrganizationId";
 
-export default function SettingsLayout() {
+export const settingsLayoutQuery = graphql`
+  query SettingsLayoutQuery($organizationId: ID!) {
+    organization: node(id: $organizationId) @required(action: THROW) {
+      __typename
+      ... on Organization {
+        ...SettingsLayoutFragment
+      }
+    }
+  }
+`;
+
+const fragment = graphql`
+  fragment SettingsLayoutFragment on Organization {
+    canListMembers: permission(action: "iam:membership:list")
+    canUpdateOrganization: permission(action: "iam:organization:update")
+  }
+`;
+
+export function SettingsLayout(props: {
+  queryRef: PreloadedQuery<SettingsLayoutQuery>;
+}) {
+  const { queryRef } = props;
+
   const organizationId = useOrganizationId();
   const { __ } = useTranslate();
 
+  const { organization } = usePreloadedQuery<SettingsLayoutQuery>(
+    settingsLayoutQuery,
+    queryRef,
+  );
+  if (organization.__typename !== "Organization") {
+    throw new Error("node is of invalid type");
+  }
+
+  const permissions = useFragment<SettingsLayoutFragment$key>(
+    fragment,
+    organization,
+  );
+
+  const prefix = `/organizations/${organizationId}/settings`;
+
   return (
     <div className="space-y-6">
-      <PageHeader title={__("Settings")} />
+      <PageHeader title={__("Organization")} />
 
       <Tabs>
-        <TabLink to={`/organizations/${organizationId}/settings/general`}>
-          <IconSettingsGear2 size={20} />
-          {__("General")}
-        </TabLink>
-        <TabLink to={`/organizations/${organizationId}/settings/saml-sso`}>
-          <IconLock size={20} />
-          {__("SAML SSO")}
-        </TabLink>
-        <TabLink to={`/organizations/${organizationId}/settings/scim`}>
-          <IconKey size={20} />
-          {__("SCIM")}
-        </TabLink>
-        <TabLink to={`/organizations/${organizationId}/settings/webhooks`}>
-          <IconSend size={20} />
-          {__("Webhooks")}
-        </TabLink>
-        <TabLink to={`/organizations/${organizationId}/settings/audit-log`}>
-          <IconListStack size={20} />
-          {__("Audit Log")}
-        </TabLink>
+        {permissions.canListMembers && (
+          <TabLink to={`${prefix}/members`}>
+            <IconGroup1 size={20} />
+            {__("Members")}
+          </TabLink>
+        )}
+        {permissions.canUpdateOrganization && (
+          <>
+            <TabLink to={`${prefix}/general`}>
+              <IconSettingsGear2 size={20} />
+              {__("General")}
+            </TabLink>
+            <TabLink to={`${prefix}/saml-sso`}>
+              <IconLock size={20} />
+              {__("SAML SSO")}
+            </TabLink>
+            <TabLink to={`${prefix}/scim`}>
+              <IconKey size={20} />
+              {__("SCIM")}
+            </TabLink>
+            <TabLink to={`${prefix}/webhooks`}>
+              <IconSend size={20} />
+              {__("Webhooks")}
+            </TabLink>
+            <TabLink to={`${prefix}/audit-log`}>
+              <IconListStack size={20} />
+              {__("Audit Log")}
+            </TabLink>
+          </>
+        )}
       </Tabs>
 
       <Outlet />
diff --git a/apps/console/src/pages/iam/organizations/people/PersonPageLoader.tsx b/apps/console/src/pages/iam/organizations/settings/SettingsLayoutLoader.tsx
similarity index 55%
rename from apps/console/src/pages/iam/organizations/people/PersonPageLoader.tsx
rename to apps/console/src/pages/iam/organizations/settings/SettingsLayoutLoader.tsx
index 03b5e63f3a..7a08d93ab2 100644
--- a/apps/console/src/pages/iam/organizations/people/PersonPageLoader.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/SettingsLayoutLoader.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2026 Probo Inc <hello@probo.com>.
+// Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -14,34 +14,36 @@
 
 import { useEffect } from "react";
 import { useQueryLoader } from "react-relay";
-import { useParams } from "react-router";
 
-import type { PersonPageQuery } from "#/__generated__/iam/PersonPageQuery.graphql";
-import { LinkCardSkeleton } from "#/components/skeletons/LinkCardSkeleton";
+import type { SettingsLayoutQuery } from "#/__generated__/iam/SettingsLayoutQuery.graphql";
+import { useOrganizationId } from "#/hooks/useOrganizationId";
 import { IAMRelayProvider } from "#/providers/IAMRelayProvider";
 
-import { PersonPage, personPageQuery } from "./PersonPage";
+import { SettingsLayout, settingsLayoutQuery } from "./SettingsLayout";
 
-function PersonPageQueryLoader() {
-  const { personId } = useParams();
-  if (!personId) {
-    throw new Error(":personId missing in route params");
-  }
-  const [queryRef, loadQuery] = useQueryLoader<PersonPageQuery>(personPageQuery);
+function SettingsLayoutQueryLoader() {
+  const organizationId = useOrganizationId();
+  const [queryRef, loadQuery] = useQueryLoader<SettingsLayoutQuery>(
+    settingsLayoutQuery,
+  );
 
   useEffect(() => {
-    loadQuery({ personId });
-  }, [personId, loadQuery]);
+    loadQuery({
+      organizationId,
+    });
+  }, [loadQuery, organizationId]);
 
-  if (!queryRef) return <LinkCardSkeleton />;
+  if (!queryRef) {
+    return null;
+  }
 
-  return <PersonPage queryRef={queryRef} />;
+  return <SettingsLayout queryRef={queryRef} />;
 }
 
-export default function PersonPageLoader() {
+export default function SettingsLayoutLoader() {
   return (
     <IAMRelayProvider>
-      <PersonPageQueryLoader />
+      <SettingsLayoutQueryLoader />
     </IAMRelayProvider>
   );
 }
diff --git a/apps/console/src/pages/iam/organizations/people/_components/AddPersonDialog.tsx b/apps/console/src/pages/iam/organizations/settings/_components/AddMemberDialog.tsx
similarity index 84%
rename from apps/console/src/pages/iam/organizations/people/_components/AddPersonDialog.tsx
rename to apps/console/src/pages/iam/organizations/settings/_components/AddMemberDialog.tsx
index 344bc385b8..01baa462af 100644
--- a/apps/console/src/pages/iam/organizations/people/_components/AddPersonDialog.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/AddMemberDialog.tsx
@@ -17,9 +17,9 @@ import { Dialog, DialogContent, useDialogRef } from "@probo/ui";
 import { type PropsWithChildren } from "react";
 import type { DataID } from "relay-runtime";
 
-import { PersonForm } from "./PersonForm";
+import { AddMemberForm } from "./AddMemberForm";
 
-export function AddPersonDialog(props: PropsWithChildren<{
+export function AddMemberDialog(props: PropsWithChildren<{
   connectionId: DataID;
 }>) {
   const { children, connectionId } = props;
@@ -28,13 +28,13 @@ export function AddPersonDialog(props: PropsWithChildren<{
 
   return (
     <Dialog
-      title={__("Add Person")}
+      title={__("Add member")}
       trigger={children}
       className="max-w-xl"
       ref={dialogRef}
     >
       <DialogContent padded>
-        <PersonForm connectionId={connectionId} onSubmit={() => dialogRef.current?.close()} />
+        <AddMemberForm connectionId={connectionId} onSubmit={() => dialogRef.current?.close()} />
       </DialogContent>
     </Dialog>
   );
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/AddMemberForm.tsx b/apps/console/src/pages/iam/organizations/settings/_components/AddMemberForm.tsx
new file mode 100644
index 0000000000..1eb60205af
--- /dev/null
+++ b/apps/console/src/pages/iam/organizations/settings/_components/AddMemberForm.tsx
@@ -0,0 +1,150 @@
+// Copyright (c) 2026 Probo Inc <hello@probo.com>.
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+import { getAssignableRoles } from "@probo/helpers";
+import { roles } from "@probo/helpers/src/roles";
+import { useTranslate } from "@probo/i18n";
+import { Button, Field, Option } from "@probo/ui";
+import { use } from "react";
+import { useWatch } from "react-hook-form";
+import { type DataID, graphql } from "relay-runtime";
+import { z } from "zod";
+
+import type { AddMemberForm_createMutation } from "#/__generated__/iam/AddMemberForm_createMutation.graphql";
+import { ControlledField } from "#/components/form/ControlledField";
+import { useFormWithSchema } from "#/hooks/useFormWithSchema";
+import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
+import { useOrganizationId } from "#/hooks/useOrganizationId";
+import { CurrentUser } from "#/providers/CurrentUser";
+
+const createMemberMutation = graphql`
+  mutation AddMemberForm_createMutation($input: CreateUserInput! $connections: [ID!]!) {
+    createUser(input: $input) {
+      profileEdge @prependEdge(connections: $connections) {
+        node {
+          ...MembersListItemFragment
+        }
+      }
+    }
+  }
+`;
+
+const schema = z.object({
+  emailAddress: z.string().email(),
+  role: z.enum(roles),
+});
+
+export function AddMemberForm(props: {
+  connectionId: DataID;
+  onSubmit?: () => void;
+}) {
+  const { connectionId, onSubmit } = props;
+
+  const organizationId = useOrganizationId();
+  const { __ } = useTranslate();
+  const { role } = use(CurrentUser);
+  const availableRoles = getAssignableRoles(role);
+
+  const { control, formState, handleSubmit: handleSubmitWrapper, register, reset }
+    = useFormWithSchema(schema, {
+      defaultValues: {
+        emailAddress: "",
+        role: "EMPLOYEE" as const,
+      },
+    });
+  const watchedRole = useWatch({
+    control,
+    name: "role",
+    defaultValue: "EMPLOYEE",
+  });
+  const [createMember, isCreating] = useMutationWithToasts<AddMemberForm_createMutation>(
+    createMemberMutation,
+    {
+      successMessage: __("Member added successfully."),
+      errorMessage: __("Failed to add member"),
+    },
+  );
+
+  const handleSubmit = handleSubmitWrapper(async (data: z.infer<typeof schema>) => {
+    await createMember({
+      variables: {
+        input: {
+          fullName: data.emailAddress.split("@")[0] ?? data.emailAddress,
+          emailAddress: data.emailAddress,
+          role: data.role,
+          organizationId,
+        },
+        connections: [connectionId],
+      },
+      onCompleted: () => {
+        reset();
+        onSubmit?.();
+      },
+    });
+  });
+
+  return (
+    <form onSubmit={e => void handleSubmit(e)} className="space-y-4">
+      <Field label={__("Email Address *")} {...register("emailAddress")} type="email" />
+      <ControlledField
+        control={control}
+        name="role"
+        type="select"
+        label={__("Role *")}
+      >
+        {availableRoles.includes("OWNER") && (
+          <Option value="OWNER">{__("Owner")}</Option>
+        )}
+        {availableRoles.includes("ADMIN") && (
+          <Option value="ADMIN">{__("Admin")}</Option>
+        )}
+        {availableRoles.includes("VIEWER") && (
+          <Option value="VIEWER">{__("Viewer")}</Option>
+        )}
+        {availableRoles.includes("AUDITOR") && (
+          <Option value="AUDITOR">{__("Auditor")}</Option>
+        )}
+        {availableRoles.includes("EMPLOYEE") && (
+          <Option value="EMPLOYEE">{__("Employee")}</Option>
+        )}
+      </ControlledField>
+
+      <div className="mt-4 space-y-2 text-sm text-txt-tertiary">
+        {watchedRole === "OWNER" && (
+          <p>{__("Full access to everything")}</p>
+        )}
+        {watchedRole === "ADMIN" && (
+          <p>
+            {__("Full access except organization setup and API keys")}
+          </p>
+        )}
+        {watchedRole === "VIEWER" && <p>{__("Read-only access")}</p>}
+        {watchedRole === "AUDITOR" && (
+          <p>
+            {__("Read-only access without settings and tasks")}
+          </p>
+        )}
+        {watchedRole === "EMPLOYEE" && (
+          <p>{__("Access to employee page")}</p>
+        )}
+      </div>
+
+      <div className="flex justify-end">
+        <Button type="submit" disabled={isCreating || !formState.isValid}>
+          {__("Add member")}
+        </Button>
+      </div>
+    </form>
+  );
+}
diff --git a/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx b/apps/console/src/pages/iam/organizations/settings/_components/MembersList.tsx
similarity index 64%
rename from apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx
rename to apps/console/src/pages/iam/organizations/settings/_components/MembersList.tsx
index 9fc50ca22c..7dc4c939b7 100644
--- a/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/MembersList.tsx
@@ -19,22 +19,22 @@ import type { ComponentProps } from "react";
 import { use } from "react";
 import { ConnectionHandler, graphql, usePaginationFragment } from "react-relay";
 
-import type { PeopleListFragment$key } from "#/__generated__/iam/PeopleListFragment.graphql";
-import type { PeopleListFragment_RefetchQuery } from "#/__generated__/iam/PeopleListFragment_RefetchQuery.graphql";
+import type { MembersListFragment$key } from "#/__generated__/iam/MembersListFragment.graphql";
+import type { MembersListFragment_RefetchQuery } from "#/__generated__/iam/MembersListFragment_RefetchQuery.graphql";
 import { type Order, SortableTable, SortableTh } from "#/components/SortableTable";
 import { useOrganizationId } from "#/hooks/useOrganizationId";
 import { CurrentUser } from "#/providers/CurrentUser";
 
-import { PeopleListItem } from "./PeopleListItem";
+import { MembersListItem } from "./MembersListItem";
 
 const fragment = graphql`
-  fragment PeopleListFragment on Organization
-  @refetchable(queryName: "PeopleListFragment_RefetchQuery")
+  fragment MembersListFragment on Organization
+  @refetchable(queryName: "MembersListFragment_RefetchQuery")
   @argumentDefinitions(
     first: { type: "Int", defaultValue: 20 }
     order: {
       type: "ProfileOrder"
-      defaultValue: { direction: ASC, field: FULL_NAME }
+      defaultValue: { direction: ASC, field: EMAIL_ADDRESS }
     }
     after: { type: "CursorKey", defaultValue: null }
     before: { type: "CursorKey", defaultValue: null }
@@ -46,21 +46,21 @@ const fragment = graphql`
       last: $last
       before: $before
       orderBy: $order
-    ) @connection(key: "PeopleListFragment_profiles", filters: ["orderBy"]) @required(action: THROW) {
+    ) @connection(key: "MembersListFragment_profiles", filters: ["orderBy"]) @required(action: THROW) {
       __id
       totalCount
       edges @required(action: THROW) {
         node {
           id
-          ...PeopleListItemFragment
+          ...MembersListItemFragment
         }
       }
     }
   }
 `;
 
-export function PeopleList(props: {
-  fKey: PeopleListFragment$key;
+export function MembersList(props: {
+  fKey: MembersListFragment$key;
   onConnectionIdChange: (connectionId: string) => void;
 }) {
   const { fKey, onConnectionIdChange } = props;
@@ -70,30 +70,32 @@ export function PeopleList(props: {
   const { role } = use(CurrentUser);
   const canManageRoles = getAssignableRoles(role).length > 0;
 
-  const peoplePagination = usePaginationFragment<
-    PeopleListFragment_RefetchQuery,
-    PeopleListFragment$key
+  const membersPagination = usePaginationFragment<
+    MembersListFragment_RefetchQuery,
+    MembersListFragment$key
   >(fragment, fKey);
 
-  const refetchPeople = () => {
-    peoplePagination.refetch({}, { fetchPolicy: "network-only" });
+  const refetchMembers = () => {
+    membersPagination.refetch({}, { fetchPolicy: "network-only" });
   };
 
   const handleOrderChange = (order: Order) => {
     onConnectionIdChange(
       ConnectionHandler.getConnectionID(
         organizationId,
-        "PeopleListFragment_profiles",
+        "MembersListFragment_profiles",
         { orderBy: order },
       ),
     );
   };
 
+  const columnCount = canManageRoles ? 3 : 2;
+
   return (
     <SortableTable
-      {...peoplePagination}
+      {...membersPagination}
       refetch={
-        peoplePagination.refetch as ComponentProps<
+        membersPagination.refetch as ComponentProps<
           typeof SortableTable
         >["refetch"]
       }
@@ -101,30 +103,27 @@ export function PeopleList(props: {
     >
       <Thead>
         <Tr>
-          <SortableTh field="FULL_NAME" onOrderChange={handleOrderChange}>{__("Name")}</SortableTh>
-          <SortableTh field="STATE">{__("Status")}</SortableTh>
           <SortableTh field="EMAIL_ADDRESS" onOrderChange={handleOrderChange}>{__("Email")}</SortableTh>
           {canManageRoles && <Th>{__("Role")}</Th>}
-          <SortableTh field="CREATED_AT" onOrderChange={handleOrderChange}>{__("Created on")}</SortableTh>
           <Th></Th>
         </Tr>
       </Thead>
       <Tbody>
-        {peoplePagination.data.profiles.totalCount === 0
+        {membersPagination.data.profiles.totalCount === 0
           ? (
               <Tr>
-                <Td colSpan={7} className="text-center text-txt-secondary">
-                  {__("No people")}
+                <Td colSpan={columnCount} className="text-center text-txt-secondary">
+                  {__("No members")}
                 </Td>
               </Tr>
             )
           : (
-              peoplePagination.data.profiles.edges.map(({ node: profile }) => (
-                <PeopleListItem
-                  connectionId={peoplePagination.data.profiles.__id}
+              membersPagination.data.profiles.edges.map(({ node: profile }) => (
+                <MembersListItem
+                  connectionId={membersPagination.data.profiles.__id}
                   key={profile.id}
                   fKey={profile}
-                  onRefetch={refetchPeople}
+                  onRefetch={refetchMembers}
                 />
               ))
             )}
diff --git a/apps/console/src/pages/iam/organizations/people/_components/PeopleListItem.tsx b/apps/console/src/pages/iam/organizations/settings/_components/MembersListItem.tsx
similarity index 84%
rename from apps/console/src/pages/iam/organizations/people/_components/PeopleListItem.tsx
rename to apps/console/src/pages/iam/organizations/settings/_components/MembersListItem.tsx
index 93d4075e1d..580338357c 100644
--- a/apps/console/src/pages/iam/organizations/people/_components/PeopleListItem.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/MembersListItem.tsx
@@ -32,14 +32,14 @@ import { use } from "react";
 import { useFragment } from "react-relay";
 import { type DataID, graphql } from "relay-runtime";
 
-import type { PeopleListItem_inviteMutation } from "#/__generated__/iam/PeopleListItem_inviteMutation.graphql";
-import type { PeopleListItemFragment$key } from "#/__generated__/iam/PeopleListItemFragment.graphql";
+import type { MembersListItem_inviteMutation } from "#/__generated__/iam/MembersListItem_inviteMutation.graphql";
+import type { MembersListItemFragment$key } from "#/__generated__/iam/MembersListItemFragment.graphql";
 import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
 import { useOrganizationId } from "#/hooks/useOrganizationId";
 import { CurrentUser } from "#/providers/CurrentUser";
 
 const fragment = graphql`
-  fragment PeopleListItemFragment on Profile {
+  fragment MembersListItemFragment on Profile {
     id
     source
     state
@@ -52,7 +52,7 @@ const fragment = graphql`
     }
     lastInvitation: pendingInvitations(first: 1, orderBy: { field: CREATED_AT, direction: DESC })
     @required(action: THROW)
-    @connection(key: "PeopleListItem_lastInvitation") {
+    @connection(key: "MembersListItem_lastInvitation") {
       __id
       edges {
         node {
@@ -61,15 +61,13 @@ const fragment = graphql`
         }
       }
     }
-    createdAt
-    canUpdate: permission(action: "iam:membership-profile:update")
     canInvite: permission(action: "iam:invitation:create")
     canDelete: permission(action: "iam:membership-profile:delete")
   }
 `;
 
 const inviteUserMutation = graphql`
-  mutation PeopleListItem_inviteMutation(
+  mutation MembersListItem_inviteMutation(
     $input: InviteUserInput!
     $connections: [ID!]!
   ) {
@@ -87,7 +85,7 @@ const inviteUserMutation = graphql`
 `;
 
 const updateRoleMutation = graphql`
-  mutation PeopleListItem_updateRoleMutation($input: UpdateMembershipInput!) {
+  mutation MembersListItem_updateRoleMutation($input: UpdateMembershipInput!) {
     updateMembership(input: $input) {
       membership {
         id
@@ -98,7 +96,7 @@ const updateRoleMutation = graphql`
 `;
 
 const removeUserMutation = graphql`
-  mutation PeopleListItem_removeMutation(
+  mutation MembersListItem_removeMutation(
     $input: RemoveUserInput!
     $connections: [ID!]!
   ) {
@@ -109,16 +107,16 @@ const removeUserMutation = graphql`
 `;
 
 const archiveUserMutation = graphql`
-  mutation PeopleListItem_archiveMutation($input: ArchiveUserInput!) {
+  mutation MembersListItem_archiveMutation($input: ArchiveUserInput!) {
     archiveUser(input: $input) {
       archivedProfileId
     }
   }
 `;
 
-export function PeopleListItem(props: {
+export function MembersListItem(props: {
   connectionId: DataID;
-  fKey: PeopleListItemFragment$key;
+  fKey: MembersListItemFragment$key;
   onRefetch: () => void;
 }) {
   const { fKey, connectionId, onRefetch } = props;
@@ -130,7 +128,7 @@ export function PeopleListItem(props: {
   const { role } = use(CurrentUser);
   const availableRoles = getAssignableRoles(role);
 
-  const profile = useFragment<PeopleListItemFragment$key>(fragment, fKey);
+  const profile = useFragment<MembersListItemFragment$key>(fragment, fKey);
   const lastInvitation = profile.lastInvitation.edges[0]?.node;
 
   const isInactive = profile.state === "INACTIVE";
@@ -140,7 +138,7 @@ export function PeopleListItem(props: {
   const canRemove = profile.canDelete && profile.source !== "SCIM";
 
   const [inviteUser]
-    = useMutationWithToasts<PeopleListItem_inviteMutation>(inviteUserMutation, {
+    = useMutationWithToasts<MembersListItem_inviteMutation>(inviteUserMutation, {
       successMessage: __("Invitation sent successfully"),
       errorMessage: __("Failed to send invitation"),
     });
@@ -250,17 +248,7 @@ export function PeopleListItem(props: {
   };
 
   return (
-    <Tr to={`/organizations/${organizationId}/people/${profile.id}`}>
-      <Td className={clsx(
-        isMutating && "opacity-60 pointer-events-none",
-        isInactive && "opacity-50",
-      )}
-      >
-        <span className="font-semibold">{profile.fullName}</span>
-      </Td>
-      <Td>
-        <Badge variant={profile.state === "INACTIVE" ? "neutral" : "success"}>{profile.state}</Badge>
-      </Td>
+    <Tr>
       <Td className={clsx(
         isMutating && "opacity-60 pointer-events-none",
         isInactive && "opacity-50",
@@ -273,7 +261,6 @@ export function PeopleListItem(props: {
       </Td>
       {availableRoles.length > 0 && (
         <Td
-          noLink
           className={clsx(
             "pr-4",
             isMutating && "opacity-60 pointer-events-none",
@@ -303,14 +290,7 @@ export function PeopleListItem(props: {
           </Select>
         </Td>
       )}
-      <Td className={clsx(
-        isMutating && "opacity-60 pointer-events-none",
-        isInactive && "opacity-50",
-      )}
-      >
-        {new Date(profile.createdAt).toLocaleDateString()}
-      </Td>
-      <Td noLink width={160} className="text-end">
+      <Td width={160} className="text-end">
         {(canSendActivationMail || canArchive || canRemove) && (
           <ActionDropdown>
             {canSendActivationMail && (
diff --git a/apps/console/src/routes.tsx b/apps/console/src/routes.tsx
index 50d45852b1..4f6726f8b4 100644
--- a/apps/console/src/routes.tsx
+++ b/apps/console/src/routes.tsx
@@ -28,7 +28,6 @@ import { PageError } from "./components/PageError";
 import { RootErrorBoundary } from "./components/RootErrorBoundary";
 import { PageSkeleton } from "./components/skeletons/PageSkeleton";
 import { ViewerLayoutLoading } from "./pages/iam/memberships/ViewerLayoutLoading";
-import { peopleRoutes } from "./pages/iam/organizations/people/routes";
 import { compliancePageRoutes } from "./pages/organizations/compliance-page/routes";
 import { cookieBannerRoutes } from "./pages/organizations/cookie-banners/routes";
 import { riskAssessmentRoutes } from "./pages/organizations/risk-assessments/routes";
@@ -253,16 +252,23 @@ const routes = [
             path: "settings",
             Fallback: PageSkeleton,
             Component: lazy(
-              () => import("./pages/iam/organizations/settings/SettingsLayout"),
+              () => import("./pages/iam/organizations/settings/SettingsLayoutLoader"),
             ),
             children: [
               {
                 index: true,
                 loader: () => {
                   // eslint-disable-next-line
-                  throw redirect("general");
+                  throw redirect("members");
                 },
               },
+              {
+                path: "members",
+                Component: lazy(
+                  () =>
+                    import("./pages/iam/organizations/settings/MembersSettingsPageLoader"),
+                ),
+              },
               {
                 path: "general",
                 Component: lazy(
@@ -300,7 +306,25 @@ const routes = [
               },
             ],
           },
-          ...peopleRoutes,
+          {
+            path: "people",
+            children: [
+              {
+                index: true,
+                loader: () => {
+                  // eslint-disable-next-line
+                  throw redirect("../settings/members");
+                },
+              },
+              {
+                path: "*",
+                loader: () => {
+                  // eslint-disable-next-line
+                  throw redirect("../settings/members");
+                },
+              },
+            ],
+          },
           ...riskRoutes,
           ...riskAssessmentRoutes,
           ...measureRoutes,