Merge pull request #4269 from Infisical/org-bulk-user-deletion

improvement(org-memberships): add bulk delete org memberships endpoint and table support
2026-09-22 13:39:35 +00:00 · 2025-07-30 18:49:57 -07:00
parent 13ef3809bd e15086edc0
commit 573b990aa3
16 changed files with 873 additions and 315 deletions
--- a/backend/src/lib/api-docs/constants.ts
+++ b/backend/src/lib/api-docs/constants.ts
@@ -664,6 +664,10 @@ export const ORGANIZATIONS = {
    organizationId: "The ID of the organization to delete the membership from.",
    membershipId: "The ID of the membership to delete."
  },
+  BULK_DELETE_USER_MEMBERSHIPS: {
+    organizationId: "The ID of the organization to delete the memberships from.",
+    membershipIds: "The IDs of the memberships to delete."
+  },
  LIST_IDENTITY_MEMBERSHIPS: {
    orgId: "The ID of the organization to get identity memberships from.",
    offset: "The offset to start from. If you enter 10, it will start from the 10th identity membership.",
--- a/backend/src/server/routes/v2/organization-router.ts
+++ b/backend/src/server/routes/v2/organization-router.ts
@@ -264,6 +264,48 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
    }
  });

+  server.route({
+    method: "DELETE",
+    url: "/:organizationId/memberships",
+    config: {
+      rateLimit: writeLimit
+    },
+    schema: {
+      hide: false,
+      tags: [ApiDocsTags.Organizations],
+      description: "Bulk delete organization user memberships",
+      security: [
+        {
+          bearerAuth: []
+        }
+      ],
+      params: z.object({
+        organizationId: z.string().trim().describe(ORGANIZATIONS.BULK_DELETE_USER_MEMBERSHIPS.organizationId)
+      }),
+      body: z.object({
+        membershipIds: z.string().trim().array().describe(ORGANIZATIONS.BULK_DELETE_USER_MEMBERSHIPS.membershipIds)
+      }),
+      response: {
+        200: z.object({
+          memberships: OrgMembershipsSchema.array()
+        })
+      }
+    },
+    onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.IDENTITY_ACCESS_TOKEN]),
+    handler: async (req) => {
+      if (req.auth.actor !== ActorType.USER) return;
+
+      const memberships = await server.services.org.bulkDeleteOrgMemberships({
+        userId: req.permission.id,
+        actorAuthMethod: req.permission.authMethod,
+        orgId: req.params.organizationId,
+        membershipIds: req.body.membershipIds,
+        actorOrgId: req.permission.orgId
+      });
+      return { memberships };
+    }
+  });
+
  server.route({
    // TODO: re-think endpoint structure in future so users only need to pass in membershipId bc organizationId is redundant
    method: "GET",
--- a/backend/src/services/org/org-dal.ts
+++ b/backend/src/services/org/org-dal.ts
@@ -513,6 +513,21 @@ export const orgDALFactory = (db: TDbClient) => {
    }
  };

+  const deleteMembershipsById = async (ids: string[], orgId: string, tx?: Knex) => {
+    try {
+      const memberships = await (tx || db)(TableName.OrgMembership)
+        .where({
+          orgId
+        })
+        .whereIn("id", ids)
+        .delete()
+        .returning("*");
+      return memberships;
+    } catch (error) {
+      throw new DatabaseError({ error, name: "Delete org memberships" });
+    }
+  };
+
  const findMembership = async (
    filter: TFindFilter<TOrgMemberships>,
    { offset, limit, sort, tx }: TFindOpt<TOrgMemberships> = {}
@@ -634,6 +649,7 @@ export const orgDALFactory = (db: TDbClient) => {
    createMembership,
    updateMembershipById,
    deleteMembershipById,
+    deleteMembershipsById,
    updateMembership
  });
 };
--- a/backend/src/services/org/org-fns.ts
+++ b/backend/src/services/org/org-fns.ts
@@ -1,5 +1,6 @@
 import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
 import { TProjectUserAdditionalPrivilegeDALFactory } from "@app/ee/services/project-user-additional-privilege/project-user-additional-privilege-dal";
+import { BadRequestError } from "@app/lib/errors";
 import { TOrgDALFactory } from "@app/services/org/org-dal";
 import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
 import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
@@ -14,6 +15,19 @@ type TDeleteOrgMembership = {
  userAliasDAL: Pick<TUserAliasDALFactory, "delete">;
  licenseService: Pick<TLicenseServiceFactory, "updateSubscriptionOrgMemberCount">;
  projectUserAdditionalPrivilegeDAL: Pick<TProjectUserAdditionalPrivilegeDALFactory, "delete">;
+  userId?: string;
+};
+
+type TDeleteOrgMemberships = {
+  orgMembershipIds: string[];
+  orgId: string;
+  orgDAL: Pick<TOrgDALFactory, "findMembership" | "deleteMembershipsById" | "transaction">;
+  projectMembershipDAL: Pick<TProjectMembershipDALFactory, "delete" | "findProjectMembershipsByUserIds">;
+  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete">;
+  userAliasDAL: Pick<TUserAliasDALFactory, "delete">;
+  licenseService: Pick<TLicenseServiceFactory, "updateSubscriptionOrgMemberCount">;
+  projectUserAdditionalPrivilegeDAL: Pick<TProjectUserAdditionalPrivilegeDALFactory, "delete">;
+  userId?: string;
 };

 export const deleteOrgMembershipFn = async ({
@@ -24,11 +38,17 @@ export const deleteOrgMembershipFn = async ({
  projectUserAdditionalPrivilegeDAL,
  projectKeyDAL,
  userAliasDAL,
-  licenseService
+  licenseService,
+  userId
 }: TDeleteOrgMembership) => {
  const deletedMembership = await orgDAL.transaction(async (tx) => {
    const orgMembership = await orgDAL.deleteMembershipById(orgMembershipId, orgId, tx);

+    if (userId && orgMembership.userId === userId) {
+      // scott: this is temporary, we will add a leave org endpoint with proper handling to ensure org isn't abandoned/broken
+      throw new BadRequestError({ message: "You cannot remove yourself from an organization" });
+    }
+
    if (!orgMembership.userId) {
      await licenseService.updateSubscriptionOrgMemberCount(orgId);
      return orgMembership;
@@ -86,3 +106,88 @@ export const deleteOrgMembershipFn = async ({

  return deletedMembership;
 };
+
+export const deleteOrgMembershipsFn = async ({
+  orgMembershipIds,
+  orgId,
+  orgDAL,
+  projectMembershipDAL,
+  projectUserAdditionalPrivilegeDAL,
+  projectKeyDAL,
+  userAliasDAL,
+  licenseService,
+  userId
+}: TDeleteOrgMemberships) => {
+  const deletedMemberships = await orgDAL.transaction(async (tx) => {
+    const orgMemberships = await orgDAL.deleteMembershipsById(orgMembershipIds, orgId, tx);
+
+    const membershipUserIds = orgMemberships
+      .filter((member) => Boolean(member.userId))
+      .map((member) => member.userId) as string[];
+
+    if (userId && membershipUserIds.includes(userId)) {
+      // scott: this is temporary, we will add a leave org endpoint with proper handling to ensure org isn't abandoned/broken
+      throw new BadRequestError({ message: "You cannot remove yourself from an organization" });
+    }
+
+    if (!membershipUserIds.length) {
+      await licenseService.updateSubscriptionOrgMemberCount(orgId);
+      return orgMemberships;
+    }
+
+    await userAliasDAL.delete(
+      {
+        $in: {
+          userId: membershipUserIds
+        },
+        orgId
+      },
+      tx
+    );
+
+    await projectUserAdditionalPrivilegeDAL.delete(
+      {
+        $in: {
+          userId: membershipUserIds
+        }
+      },
+      tx
+    );
+
+    // Get all the project memberships of the users in the organization
+    const projectMemberships = await projectMembershipDAL.findProjectMembershipsByUserIds(orgId, membershipUserIds);
+
+    // Delete all the project memberships of the users in the organization
+    await projectMembershipDAL.delete(
+      {
+        $in: {
+          id: projectMemberships.map((membership) => membership.id)
+        }
+      },
+      tx
+    );
+
+    // Get all the project keys of the user in the organization
+    const projectKeys = await projectKeyDAL.find({
+      $in: {
+        projectId: projectMemberships.map((membership) => membership.projectId),
+        receiverId: membershipUserIds
+      }
+    });
+
+    // Delete all the project keys of the user in the organization
+    await projectKeyDAL.delete(
+      {
+        $in: {
+          id: projectKeys.map((key) => key.id)
+        }
+      },
+      tx
+    );
+
+    await licenseService.updateSubscriptionOrgMemberCount(orgId);
+    return orgMemberships;
+  });
+
+  return deletedMemberships;
+};
--- a/backend/src/services/org/org-service.ts
+++ b/backend/src/services/org/org-service.ts
@@ -75,10 +75,11 @@ import { TUserDALFactory } from "../user/user-dal";
 import { TIncidentContactsDALFactory } from "./incident-contacts-dal";
 import { TOrgBotDALFactory } from "./org-bot-dal";
 import { TOrgDALFactory } from "./org-dal";
-import { deleteOrgMembershipFn } from "./org-fns";
+import { deleteOrgMembershipFn, deleteOrgMembershipsFn } from "./org-fns";
 import { TOrgRoleDALFactory } from "./org-role-dal";
 import {
  TDeleteOrgMembershipDTO,
+  TDeleteOrgMembershipsDTO,
  TFindAllWorkspacesDTO,
  TFindOrgMembersByEmailDTO,
  TGetOrgGroupsDTO,
@@ -106,7 +107,13 @@ type TOrgServiceFactoryDep = {
  identityMetadataDAL: Pick<TIdentityMetadataDALFactory, "delete" | "insertMany" | "transaction">;
  projectMembershipDAL: Pick<
    TProjectMembershipDALFactory,
-    "findProjectMembershipsByUserId" | "delete" | "create" | "find" | "insertMany" | "transaction"
+    | "findProjectMembershipsByUserId"
+    | "delete"
+    | "create"
+    | "find"
+    | "insertMany"
+    | "transaction"
+    | "findProjectMembershipsByUserIds"
  >;
  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete" | "insertMany" | "findLatestProjectKey" | "create">;
  orgMembershipDAL: Pick<
@@ -1369,12 +1376,42 @@ export const orgServiceFactory = ({
      projectUserAdditionalPrivilegeDAL,
      projectKeyDAL,
      userAliasDAL,
-      licenseService
+      licenseService,
+      userId
    });

    return deletedMembership;
  };

+  const bulkDeleteOrgMemberships = async ({
+    orgId,
+    userId,
+    membershipIds,
+    actorAuthMethod,
+    actorOrgId
+  }: TDeleteOrgMembershipsDTO) => {
+    const { permission } = await permissionService.getUserOrgPermission(userId, orgId, actorAuthMethod, actorOrgId);
+    ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Delete, OrgPermissionSubjects.Member);
+
+    if (membershipIds.includes(userId)) {
+      throw new BadRequestError({ message: "You cannot delete your own organization membership" });
+    }
+
+    const deletedMemberships = await deleteOrgMembershipsFn({
+      orgMembershipIds: membershipIds,
+      orgId,
+      orgDAL,
+      projectMembershipDAL,
+      projectUserAdditionalPrivilegeDAL,
+      projectKeyDAL,
+      userAliasDAL,
+      licenseService,
+      userId
+    });
+
+    return deletedMemberships;
+  };
+
  const listProjectMembershipsByOrgMembershipId = async ({
    orgMembershipId,
    orgId,
@@ -1528,6 +1565,7 @@ export const orgServiceFactory = ({
    findOrgBySlug,
    resendOrgMemberInvitation,
    upgradePrivilegeSystem,
-    notifyInvitedUsers
+    notifyInvitedUsers,
+    bulkDeleteOrgMemberships
  };
 };
--- a/backend/src/services/org/org-types.ts
+++ b/backend/src/services/org/org-types.ts
@@ -25,6 +25,14 @@ export type TDeleteOrgMembershipDTO = {
  actorAuthMethod: ActorAuthMethod;
 };

+export type TDeleteOrgMembershipsDTO = {
+  userId: string;
+  orgId: string;
+  membershipIds: string[];
+  actorOrgId: string | undefined;
+  actorAuthMethod: ActorAuthMethod;
+};
+
 export type TInviteUserToOrgDTO = {
  inviteeEmails: string[];
  organizationRoleSlug: string;
--- a/backend/src/services/project-membership/project-membership-dal.ts
+++ b/backend/src/services/project-membership/project-membership-dal.ts
@@ -314,11 +314,122 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
    }
  };

+  const findProjectMembershipsByUserIds = async (orgId: string, userIds: string[]) => {
+    try {
+      const docs = await db
+        .replicaNode()(TableName.ProjectMembership)
+        .join(TableName.Project, `${TableName.ProjectMembership}.projectId`, `${TableName.Project}.id`)
+        .join(TableName.Users, `${TableName.ProjectMembership}.userId`, `${TableName.Users}.id`)
+        .whereIn(`${TableName.Users}.id`, userIds)
+        .where(`${TableName.Project}.orgId`, orgId)
+        .join<TUserEncryptionKeys>(
+          TableName.UserEncryptionKey,
+          `${TableName.UserEncryptionKey}.userId`,
+          `${TableName.Users}.id`
+        )
+        .join(
+          TableName.ProjectUserMembershipRole,
+          `${TableName.ProjectUserMembershipRole}.projectMembershipId`,
+          `${TableName.ProjectMembership}.id`
+        )
+        .leftJoin(
+          TableName.ProjectRoles,
+          `${TableName.ProjectUserMembershipRole}.customRoleId`,
+          `${TableName.ProjectRoles}.id`
+        )
+        .select(
+          db.ref("id").withSchema(TableName.ProjectMembership),
+          db.ref("isGhost").withSchema(TableName.Users),
+          db.ref("username").withSchema(TableName.Users),
+          db.ref("email").withSchema(TableName.Users),
+          db.ref("publicKey").withSchema(TableName.UserEncryptionKey),
+          db.ref("firstName").withSchema(TableName.Users),
+          db.ref("lastName").withSchema(TableName.Users),
+          db.ref("id").withSchema(TableName.Users).as("userId"),
+          db.ref("role").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("id").withSchema(TableName.ProjectUserMembershipRole).as("membershipRoleId"),
+          db.ref("customRoleId").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("name").withSchema(TableName.ProjectRoles).as("customRoleName"),
+          db.ref("slug").withSchema(TableName.ProjectRoles).as("customRoleSlug"),
+          db.ref("temporaryMode").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("isTemporary").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("temporaryRange").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("temporaryAccessStartTime").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("temporaryAccessEndTime").withSchema(TableName.ProjectUserMembershipRole),
+          db.ref("name").as("projectName").withSchema(TableName.Project),
+          db.ref("id").as("projectId").withSchema(TableName.Project),
+          db.ref("type").as("projectType").withSchema(TableName.Project)
+        )
+        .where({ isGhost: false });
+
+      const members = sqlNestRelationships({
+        data: docs,
+        parentMapper: ({
+          email,
+          firstName,
+          username,
+          lastName,
+          publicKey,
+          isGhost,
+          id,
+          projectId,
+          projectName,
+          projectType,
+          userId
+        }) => ({
+          id,
+          userId,
+          projectId,
+          user: { email, username, firstName, lastName, id: userId, publicKey, isGhost },
+          project: {
+            id: projectId,
+            name: projectName,
+            type: projectType
+          }
+        }),
+        key: "id",
+        childrenMapper: [
+          {
+            label: "roles" as const,
+            key: "membershipRoleId",
+            mapper: ({
+              role,
+              customRoleId,
+              customRoleName,
+              customRoleSlug,
+              membershipRoleId,
+              temporaryRange,
+              temporaryMode,
+              temporaryAccessEndTime,
+              temporaryAccessStartTime,
+              isTemporary
+            }) => ({
+              id: membershipRoleId,
+              role,
+              customRoleId,
+              customRoleName,
+              customRoleSlug,
+              temporaryRange,
+              temporaryMode,
+              temporaryAccessEndTime,
+              temporaryAccessStartTime,
+              isTemporary
+            })
+          }
+        ]
+      });
+      return members;
+    } catch (error) {
+      throw new DatabaseError({ error, name: "Find project memberships by user ids" });
+    }
+  };
+
  return {
    ...projectMemberOrm,
    findAllProjectMembers,
    findProjectGhostUser,
    findMembershipsByUsername,
-    findProjectMembershipsByUserId
+    findProjectMembershipsByUserId,
+    findProjectMembershipsByUserIds
  };
 };
--- a/docs/api-reference/endpoints/organizations/bulk-delete-memberships.mdx
+++ b/docs/api-reference/endpoints/organizations/bulk-delete-memberships.mdx
@@ -0,0 +1,4 @@
+---
+title: "Bulk Delete User Memberships"
+openapi: "DELETE /api/v2/organizations/{organizationId}/memberships"
+---
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -905,6 +905,7 @@
                  "api-reference/endpoints/organizations/memberships",
                  "api-reference/endpoints/organizations/update-membership",
                  "api-reference/endpoints/organizations/delete-membership",
+                  "api-reference/endpoints/organizations/bulk-delete-memberships",
                  "api-reference/endpoints/organizations/list-identity-memberships",
                  "api-reference/endpoints/organizations/workspaces"
                ]
--- a/frontend/src/hooks/api/users/queries.tsx
+++ b/frontend/src/hooks/api/users/queries.tsx
@@ -17,7 +17,8 @@ import {
  APIKeyData,
  AuthMethod,
  CreateAPIKeyRes,
-  DeletOrgMembershipDTO,
+  DeleteOrgMembershipBatchDTO,
+  DeleteOrgMembershipDTO,
  OrgUser,
  RenameUserDTO,
  TokenVersion,
@@ -243,7 +244,7 @@ export const useGetOrgMembershipProjectMemberships = (
 export const useDeleteOrgMembership = () => {
  const queryClient = useQueryClient();

-  return useMutation<object, object, DeletOrgMembershipDTO>({
+  return useMutation<object, object, DeleteOrgMembershipDTO>({
    mutationFn: ({ membershipId, orgId }) => {
      return apiRequest.delete(`/api/v2/organizations/${orgId}/memberships/${membershipId}`);
    },
@@ -253,10 +254,27 @@ export const useDeleteOrgMembership = () => {
  });
 };

+export const useDeleteOrgMembershipBatch = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<object, object, DeleteOrgMembershipBatchDTO>({
+    mutationFn: ({ membershipIds, orgId }) => {
+      return apiRequest.delete(`/api/v2/organizations/${orgId}/memberships`, {
+        data: {
+          membershipIds
+        }
+      });
+    },
+    onSuccess: (_, { orgId }) => {
+      queryClient.invalidateQueries({ queryKey: userKeys.getOrgUsers(orgId) });
+    }
+  });
+};
+
 export const useDeactivateOrgMembership = () => {
  const queryClient = useQueryClient();

-  return useMutation<object, object, DeletOrgMembershipDTO>({
+  return useMutation<object, object, DeleteOrgMembershipDTO>({
    mutationFn: ({ membershipId, orgId }) => {
      return apiRequest.post(
        `/api/v2/organizations/${orgId}/memberships/${membershipId}/deactivate`
--- a/frontend/src/hooks/api/users/types.ts
+++ b/frontend/src/hooks/api/users/types.ts
@@ -143,11 +143,16 @@ export type UpdateOrgMembershipDTO = {
  metadata?: { key: string; value: string }[];
 };

-export type DeletOrgMembershipDTO = {
+export type DeleteOrgMembershipDTO = {
  membershipId: string;
  orgId: string;
 };

+export type DeleteOrgMembershipBatchDTO = {
+  membershipIds: string[];
+  orgId: string;
+};
+
 export type AddUserToOrgDTO = {
  inviteeEmails: string[];
  organizationRoleSlug: string;
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
@@ -1,18 +1,28 @@
 import { useState } from "react";
-import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faBan, faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";

 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { OrgPermissionCan } from "@app/components/permissions";
-import { Button, DeleteActionModal, EmailServiceSetupModal } from "@app/components/v2";
+import {
+  Badge,
+  Button,
+  DeleteActionModal,
+  EmailServiceSetupModal,
+  Tooltip
+} from "@app/components/v2";
 import {
  OrgPermissionActions,
  OrgPermissionSubjects,
  useOrganization,
-  useSubscription
+  useSubscription,
+  useUser
 } from "@app/context";
-import { useDeleteOrgMembership, useUpdateOrgMembership } from "@app/hooks/api";
+import { useDeleteOrgMembership, useGetOrgUsers, useUpdateOrgMembership } from "@app/hooks/api";
+import { useDeleteOrgMembershipBatch } from "@app/hooks/api/users/queries";
+import { OrgUser } from "@app/hooks/api/users/types";
 import { usePopUp } from "@app/hooks/usePopUp";

 import { AddOrgMemberModal } from "./AddOrgMemberModal";
@@ -22,7 +32,8 @@ export const OrgMembersSection = () => {
  const { subscription } = useSubscription();
  const { currentOrg } = useOrganization();
  const orgId = currentOrg?.id ?? "";
-
+  const { user } = useUser();
+  const userId = user?.id || "";
  const [completeInviteLinks, setCompleteInviteLinks] = useState<Array<{
    email: string;
    link: string;
@@ -33,10 +44,14 @@ export const OrgMembersSection = () => {
    "removeMember",
    "deactivateMember",
    "upgradePlan",
-    "setUpEmail"
+    "setUpEmail",
+    "removeMembers"
  ] as const);

+  const [selectedMemberIds, setSelectedMemberIds] = useState<string[]>([]);
+
  const { mutateAsync: deleteMutateAsync } = useDeleteOrgMembership();
+  const { mutateAsync: deleteBatchMutateAsync } = useDeleteOrgMembershipBatch();
  const { mutateAsync: updateOrgMembership } = useUpdateOrgMembership();

  const isMoreIdentitiesAllowed = subscription?.identityLimit
@@ -109,70 +124,199 @@ export const OrgMembersSection = () => {
    handlePopUpClose("removeMember");
  };

+  const { data: members = [] } = useGetOrgUsers(orgId);
+
+  const handleRemoveMembers = async (selectedMembers: OrgUser[]) => {
+    try {
+      await deleteBatchMutateAsync({
+        orgId,
+        membershipIds: selectedMembers
+          .filter((member) => member.user.id !== userId)
+          .map((member) => member.id)
+      });
+
+      createNotification({
+        text: "Successfully removed users from organization",
+        type: "success"
+      });
+
+      setSelectedMemberIds([]);
+      handlePopUpClose("removeMembers");
+    } catch {
+      createNotification({
+        text: "Failed to remove users from the organization",
+        type: "error"
+      });
+    }
+  };
+
  return (
-    <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-      <div className="mb-4 flex items-center justify-between">
-        <p className="text-xl font-semibold text-mineshaft-100">Users</p>
-        <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Member}>
-          {(isAllowed) => (
-            <Button
-              colorSchema="secondary"
-              type="submit"
-              leftIcon={<FontAwesomeIcon icon={faPlus} />}
-              onClick={() => handleAddMemberModal()}
-              isDisabled={!isAllowed}
-            >
-              Add Member
-            </Button>
-          )}
-        </OrgPermissionCan>
+    <>
+      <div
+        className={twMerge(
+          "h-0 flex-shrink-0 overflow-hidden transition-all",
+          selectedMemberIds.length > 0 && "h-16"
+        )}
+      >
+        <div className="flex items-center rounded-md border border-mineshaft-600 bg-mineshaft-800 px-4 py-2 text-bunker-300">
+          <div className="mr-2 text-sm">{selectedMemberIds.length} Selected</div>
+          <button
+            type="button"
+            className="mr-auto text-xs text-mineshaft-400 underline-offset-2 hover:text-mineshaft-200 hover:underline"
+            onClick={() => setSelectedMemberIds([])}
+          >
+            Unselect All
+          </button>
+          <OrgPermissionCan
+            I={OrgPermissionActions.Delete}
+            a={OrgPermissionSubjects.Member}
+            renderTooltip
+            allowedLabel={
+              currentOrg?.scimEnabled
+                ? "You cannot manage users from Infisical when org-level auth is enforced for your organization"
+                : undefined
+            }
+          >
+            {(isAllowed) => (
+              <Button
+                variant="outline_bg"
+                colorSchema="danger"
+                leftIcon={<FontAwesomeIcon icon={faTrash} />}
+                className="ml-2"
+                onClick={() => {
+                  const selectedOrgMemberships = members.filter((member) =>
+                    selectedMemberIds.includes(member.id)
+                  );
+
+                  if (!selectedOrgMemberships.length) return;
+
+                  handlePopUpOpen("removeMembers", { selectedOrgMemberships });
+                }}
+                isDisabled={!isAllowed || currentOrg?.scimEnabled}
+                size="xs"
+              >
+                Delete
+              </Button>
+            )}
+          </OrgPermissionCan>
+        </div>
      </div>
-      <OrgMembersTable
-        handlePopUpOpen={handlePopUpOpen}
-        setCompleteInviteLinks={setCompleteInviteLinks}
-      />
-      <AddOrgMemberModal
-        popUp={popUp}
-        handlePopUpToggle={handlePopUpToggle}
-        completeInviteLinks={completeInviteLinks}
-        setCompleteInviteLinks={setCompleteInviteLinks}
-      />
-      <DeleteActionModal
-        isOpen={popUp.removeMember.isOpen}
-        title={`Are you sure you want to remove member with username ${
-          (popUp?.removeMember?.data as { username: string })?.username || ""
-        }?`}
-        onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
-        deleteKey="confirm"
-        onDeleteApproved={() =>
-          onRemoveMemberSubmit(
-            (popUp?.removeMember?.data as { orgMembershipId: string })?.orgMembershipId
-          )
-        }
-      />
-      <DeleteActionModal
-        isOpen={popUp.deactivateMember.isOpen}
-        title={`Are you sure you want to deactivate member with username ${
-          (popUp?.deactivateMember?.data as { username: string })?.username || ""
-        }?`}
-        onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}
-        deleteKey="confirm"
-        onDeleteApproved={() =>
-          onDeactivateMemberSubmit(
-            (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
-          )
-        }
-        buttonText="Deactivate"
-      />
-      <UpgradePlanModal
-        isOpen={popUp.upgradePlan.isOpen}
-        onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
-        text={(popUp.upgradePlan?.data as { description: string })?.description}
-      />
-      <EmailServiceSetupModal
-        isOpen={popUp.setUpEmail?.isOpen}
-        onOpenChange={(isOpen) => handlePopUpToggle("setUpEmail", isOpen)}
-      />
-    </div>
+      <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+        <div className="mb-4 flex items-center justify-between">
+          <p className="text-xl font-semibold text-mineshaft-100">Users</p>
+          <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Member}>
+            {(isAllowed) => (
+              <Button
+                colorSchema="secondary"
+                type="submit"
+                leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                onClick={() => handleAddMemberModal()}
+                isDisabled={!isAllowed}
+              >
+                Add Member
+              </Button>
+            )}
+          </OrgPermissionCan>
+        </div>
+        <OrgMembersTable
+          handlePopUpOpen={handlePopUpOpen}
+          setCompleteInviteLinks={setCompleteInviteLinks}
+          selectedMemberIds={selectedMemberIds}
+          setSelectedMemberIds={setSelectedMemberIds}
+        />
+        <AddOrgMemberModal
+          popUp={popUp}
+          handlePopUpToggle={handlePopUpToggle}
+          completeInviteLinks={completeInviteLinks}
+          setCompleteInviteLinks={setCompleteInviteLinks}
+        />
+        <DeleteActionModal
+          isOpen={popUp.removeMember.isOpen}
+          title={`Are you sure you want to remove member with username ${
+            (popUp?.removeMember?.data as { username: string })?.username || ""
+          }?`}
+          onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
+          deleteKey="confirm"
+          onDeleteApproved={() =>
+            onRemoveMemberSubmit(
+              (popUp?.removeMember?.data as { orgMembershipId: string })?.orgMembershipId
+            )
+          }
+        />
+        <DeleteActionModal
+          isOpen={popUp.deactivateMember.isOpen}
+          title={`Are you sure you want to deactivate member with username ${
+            (popUp?.deactivateMember?.data as { username: string })?.username || ""
+          }?`}
+          onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}
+          deleteKey="confirm"
+          onDeleteApproved={() =>
+            onDeactivateMemberSubmit(
+              (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
+            )
+          }
+          buttonText="Deactivate"
+        />
+        <DeleteActionModal
+          isOpen={popUp.removeMembers.isOpen}
+          title="Are you sure you want to remove the following members?"
+          onChange={(isOpen) => handlePopUpToggle("removeMembers", isOpen)}
+          deleteKey="confirm"
+          onDeleteApproved={() =>
+            handleRemoveMembers(popUp.removeMembers.data.selectedOrgMemberships as OrgUser[])
+          }
+          buttonText="Remove"
+        >
+          <div className="mt-4 text-sm text-mineshaft-400">
+            The following members will be removed:
+          </div>
+          <div className="mt-2 max-h-[20rem] overflow-y-auto rounded border border-mineshaft-600 bg-red/10 p-4 pl-8 text-sm text-red-200">
+            <ul className="list-disc">
+              {(popUp.removeMembers.data?.selectedOrgMemberships as OrgUser[])?.map((member) => {
+                const email = member.user.email ?? member.user.username ?? member.inviteEmail;
+                return (
+                  <li key={member.id}>
+                    <div className="flex items-center">
+                      <p className={userId === member.user.id ? "line-through" : ""}>
+                        {member.user.firstName || member.user.lastName ? (
+                          <>
+                            {`${`${member.user.firstName} ${member.user.lastName}`.trim()} `}(
+                            <span className="break-all">{email}</span>)
+                          </>
+                        ) : (
+                          <span className="break-all">{email}</span>
+                        )}{" "}
+                      </p>
+                      {userId === member.user.id && (
+                        <Tooltip content="You cannot remove yourself from this organization">
+                          <div className="inline-block">
+                            <Badge
+                              variant="danger"
+                              className="ml-1 mt-[0.05rem] inline-flex w-min items-center gap-1.5 whitespace-nowrap"
+                            >
+                              <FontAwesomeIcon icon={faBan} />
+                              <span>Ignored</span>
+                            </Badge>
+                          </div>
+                        </Tooltip>
+                      )}
+                    </div>
+                  </li>
+                );
+              })}
+            </ul>
+          </div>
+        </DeleteActionModal>
+        <UpgradePlanModal
+          isOpen={popUp.upgradePlan.isOpen}
+          onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
+          text={(popUp.upgradePlan?.data as { description: string })?.description}
+        />
+        <EmailServiceSetupModal
+          isOpen={popUp.setUpEmail?.isOpen}
+          onOpenChange={(isOpen) => handlePopUpToggle("setUpEmail", isOpen)}
+        />
+      </div>
+    </>
  );
 };
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
+import { Dispatch, SetStateAction, useCallback, useMemo, useState } from "react";
 import {
  faArrowDown,
  faArrowUp,
@@ -10,6 +10,7 @@ import {
  faMagnifyingGlass,
  faSearch,
  faUsers,
+  faUserShield,
  faUserSlash,
  faUserXmark
 } from "@fortawesome/free-solid-svg-icons";
@@ -22,6 +23,7 @@ import { OrgPermissionCan } from "@app/components/permissions";
 import {
  Badge,
  Button,
+  Checkbox,
  DropdownMenu,
  DropdownMenuContent,
  DropdownMenuItem,
@@ -43,6 +45,7 @@ import {
  Td,
  Th,
  THead,
+  Tooltip,
  Tr
 } from "@app/components/v2";
 import {
@@ -66,18 +69,24 @@ import {
 } from "@app/hooks/api";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { useResendOrgMemberInvitation } from "@app/hooks/api/users/mutation";
+import { OrgUser } from "@app/hooks/api/users/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";

 type Props = {
  handlePopUpOpen: (
-    popUpName: keyof UsePopUpState<["removeMember", "deactivateMember", "upgradePlan"]>,
+    popUpName: keyof UsePopUpState<
+      ["removeMember", "deactivateMember", "upgradePlan", "removeMembers"]
+    >,
    data?: {
      orgMembershipId?: string;
      username?: string;
      description?: string;
+      selectedOrgMemberships?: OrgUser[];
    }
  ) => void;
  setCompleteInviteLinks: (links: Array<{ email: string; link: string }> | null) => void;
+  selectedMemberIds: string[];
+  setSelectedMemberIds: Dispatch<SetStateAction<string[]>>;
 };

 enum OrgMembersOrderBy {
@@ -90,7 +99,12 @@ type Filter = {
  roles: string[];
 };

-export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Props) => {
+export const OrgMembersTable = ({
+  handlePopUpOpen,
+  setCompleteInviteLinks,
+  selectedMemberIds,
+  setSelectedMemberIds
+}: Props) => {
  const navigate = useNavigate();
  const { subscription } = useSubscription();
  const { currentOrg } = useOrganization();
@@ -208,7 +222,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
    roles: []
  });

-  const filteredUsers = useMemo(
+  const filteredMembers = useMemo(
    () =>
      members
        ?.filter(({ user: u, inviteEmail, role, roleId }) => {
@@ -273,7 +287,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
  };

  useResetPageHelper({
-    totalCount: filteredUsers.length,
+    totalCount: filteredMembers.length,
    offset,
    setPage
  });
@@ -293,6 +307,16 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro

  const isTableFiltered = Boolean(filter.roles.length);

+  const filteredMembersPage = filteredMembers.slice(offset, perPage * page);
+
+  const isPageSelected = filteredMembersPage.every((member) =>
+    selectedMemberIds.includes(member.id)
+  );
+
+  const isPageIndeterminate = isPageSelected
+    ? false
+    : filteredMembersPage.some((member) => selectedMemberIds.includes(member.id));
+
  return (
    <div>
      <div className="flex gap-2">
@@ -357,6 +381,26 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
        <Table>
          <THead>
            <Tr>
+              <Th className="w-5">
+                <Checkbox
+                  id="member-page-select"
+                  isChecked={isPageSelected || isPageIndeterminate}
+                  isIndeterminate={isPageIndeterminate}
+                  onCheckedChange={() => {
+                    if (isPageSelected) {
+                      setSelectedMemberIds((prev) =>
+                        prev.filter(
+                          (memberId) => !filteredMembersPage.find((m) => m.id === memberId)
+                        )
+                      );
+                    } else {
+                      setSelectedMemberIds((prev) => [
+                        ...new Set([...prev, ...filteredMembersPage.map((member) => member.id)])
+                      ]);
+                    }
+                  }}
+                />
+              </Th>
              <Th className="w-1/3">
                <div className="flex items-center">
                  Name
@@ -423,227 +467,241 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
          <TBody>
            {isLoading && <TableSkeleton columns={5} innerKey="org-members" />}
            {!isLoading &&
-              filteredUsers
-                .slice(offset, perPage * page)
-                .map(
-                  ({
-                    user: u,
-                    inviteEmail,
-                    role,
-                    roleId,
-                    id: orgMembershipId,
-                    status,
-                    isActive
-                  }) => {
-                    const name =
-                      u && u.firstName ? `${u.firstName} ${u.lastName ?? ""}`.trim() : null;
-                    const email = u?.email || inviteEmail;
-                    const username = u?.username ?? inviteEmail ?? "-";
-                    return (
-                      <Tr
-                        key={`org-membership-${orgMembershipId}`}
-                        className="h-10 w-full cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
-                        onClick={() =>
-                          navigate({
-                            to: "/organization/members/$membershipId" as const,
-                            params: {
-                              membershipId: orgMembershipId
-                            }
-                          })
-                        }
-                      >
-                        <Td className={isActive ? "" : "text-mineshaft-400"}>
-                          {name ?? <span className="text-mineshaft-400">Not Set</span>}
+              filteredMembersPage.map(
+                ({ user: u, inviteEmail, role, roleId, id: orgMembershipId, status, isActive }) => {
+                  const name =
+                    u && u.firstName ? `${u.firstName} ${u.lastName ?? ""}`.trim() : null;
+                  const email = u?.email || inviteEmail;
+                  const username = u?.username ?? inviteEmail ?? "-";
+                  const isSelected = selectedMemberIds.includes(orgMembershipId);
+                  return (
+                    <Tr
+                      key={`org-membership-${orgMembershipId}`}
+                      className="h-10 w-full cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
+                      onClick={() =>
+                        navigate({
+                          to: "/organization/members/$membershipId" as const,
+                          params: {
+                            membershipId: orgMembershipId
+                          }
+                        })
+                      }
+                    >
+                      <Td>
+                        <Checkbox
+                          id={`select-member-${orgMembershipId}`}
+                          isChecked={isSelected}
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            setSelectedMemberIds((prev) =>
+                              isSelected
+                                ? prev.filter((id) => id !== orgMembershipId)
+                                : [...prev, orgMembershipId]
+                            );
+                          }}
+                        />
+                      </Td>
+                      <Td className={twMerge("max-w-0", isActive ? "" : "text-mineshaft-400")}>
+                        <div className="flex items-center">
+                          <p className="truncate">
+                            {name ?? <span className="text-mineshaft-400">Not Set</span>}
+                          </p>
                          {u.superAdmin && (
-                            <Badge variant="primary" className="ml-2">
-                              Server Admin
+                            <Badge variant="primary" className="ml-2 w-min whitespace-nowrap">
+                              <span className="hidden xl:inline">Server Admin</span>
+                              <Tooltip content="Server Admin">
+                                <FontAwesomeIcon className="xl:hidden" icon={faUserShield} />
+                              </Tooltip>
                            </Badge>
                          )}
-                        </Td>
-                        <Td className={isActive ? "" : "text-mineshaft-400"}>{username}</Td>
-                        <Td>
-                          <OrgPermissionCan
-                            I={OrgPermissionActions.Edit}
-                            a={OrgPermissionSubjects.Member}
-                          >
-                            {(isAllowed) => (
-                              <Select
-                                value={role === "custom" ? findRoleFromId(roleId)?.slug : role}
-                                isDisabled={userId === u?.id || !isAllowed}
-                                className="h-8 w-48 bg-mineshaft-700"
-                                position="popper"
-                                dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
-                                onValueChange={(selectedRole) =>
-                                  onRoleChange(orgMembershipId, selectedRole)
-                                }
+                        </div>
+                      </Td>
+                      <Td className={twMerge("max-w-0", isActive ? "" : "text-mineshaft-400")}>
+                        <p className="truncate">{username}</p>
+                      </Td>
+                      <Td>
+                        <OrgPermissionCan
+                          I={OrgPermissionActions.Edit}
+                          a={OrgPermissionSubjects.Member}
+                        >
+                          {(isAllowed) => (
+                            <Select
+                              value={role === "custom" ? findRoleFromId(roleId)?.slug : role}
+                              isDisabled={userId === u?.id || !isAllowed}
+                              className="h-8 w-48 bg-mineshaft-700"
+                              position="popper"
+                              dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
+                              onValueChange={(selectedRole) =>
+                                onRoleChange(orgMembershipId, selectedRole)
+                              }
+                            >
+                              {(roles || [])
+                                .filter(({ slug }) =>
+                                  slug === "owner" ? isIamOwner || role === "owner" : true
+                                )
+                                .map(({ slug, name: roleName }) => (
+                                  <SelectItem value={slug} key={`owner-option-${slug}`}>
+                                    {roleName}
+                                  </SelectItem>
+                                ))}
+                            </Select>
+                          )}
+                        </OrgPermissionCan>
+                      </Td>
+                      <Td>
+                        <div className="flex items-center justify-end gap-6">
+                          {isActive &&
+                            (status === "invited" || status === "verified") &&
+                            email &&
+                            serverDetails?.emailConfigured && (
+                              <OrgPermissionCan
+                                I={OrgPermissionActions.Edit}
+                                a={OrgPermissionSubjects.Member}
                              >
-                                {(roles || [])
-                                  .filter(({ slug }) =>
-                                    slug === "owner" ? isIamOwner || role === "owner" : true
-                                  )
-                                  .map(({ slug, name: roleName }) => (
-                                    <SelectItem value={slug} key={`owner-option-${slug}`}>
-                                      {roleName}
-                                    </SelectItem>
-                                  ))}
-                              </Select>
+                                {(isAllowed) => (
+                                  <Button
+                                    isDisabled={!isAllowed || isResendInvitePending}
+                                    className="h-8 border-mineshaft-600 bg-mineshaft-700 font-normal"
+                                    colorSchema="primary"
+                                    variant="outline_bg"
+                                    isLoading={
+                                      isResendInvitePending && resendInviteId === orgMembershipId
+                                    }
+                                    onClick={(e) => {
+                                      onResendInvite(orgMembershipId);
+                                      e.stopPropagation();
+                                    }}
+                                  >
+                                    Resend Invite
+                                  </Button>
+                                )}
+                              </OrgPermissionCan>
                            )}
-                          </OrgPermissionCan>
-                        </Td>
-                        <Td>
-                          <div className="flex items-center justify-end gap-6">
-                            {isActive &&
-                              (status === "invited" || status === "verified") &&
-                              email &&
-                              serverDetails?.emailConfigured && (
-                                <OrgPermissionCan
-                                  I={OrgPermissionActions.Edit}
-                                  a={OrgPermissionSubjects.Member}
-                                >
-                                  {(isAllowed) => (
-                                    <Button
-                                      isDisabled={!isAllowed || isResendInvitePending}
-                                      className="h-8 border-mineshaft-600 bg-mineshaft-700 font-normal"
-                                      colorSchema="primary"
-                                      variant="outline_bg"
-                                      isLoading={
-                                        isResendInvitePending && resendInviteId === orgMembershipId
+                          <DropdownMenu>
+                            <DropdownMenuTrigger disabled={userId === u?.id} asChild>
+                              <IconButton
+                                ariaLabel="Options"
+                                colorSchema="secondary"
+                                className={twMerge("w-6", userId === u?.id && "opacity-50")}
+                                variant="plain"
+                                isDisabled={userId === u?.id}
+                              >
+                                <FontAwesomeIcon icon={faEllipsisV} />
+                              </IconButton>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent sideOffset={2} align="end">
+                              <OrgPermissionCan
+                                I={OrgPermissionActions.Edit}
+                                a={OrgPermissionSubjects.Member}
+                              >
+                                {(isAllowed) => (
+                                  <DropdownMenuItem
+                                    onClick={(e) => {
+                                      e.stopPropagation();
+                                      navigate({
+                                        to: "/organization/members/$membershipId" as const,
+                                        params: {
+                                          membershipId: orgMembershipId
+                                        }
+                                      });
+                                    }}
+                                    isDisabled={!isAllowed}
+                                    icon={<FontAwesomeIcon icon={faEdit} />}
+                                  >
+                                    Edit User
+                                  </DropdownMenuItem>
+                                )}
+                              </OrgPermissionCan>
+                              <OrgPermissionCan
+                                I={OrgPermissionActions.Delete}
+                                a={OrgPermissionSubjects.Member}
+                              >
+                                {(isAllowed) => (
+                                  <DropdownMenuItem
+                                    icon={<FontAwesomeIcon icon={faUserSlash} />}
+                                    onClick={async (e) => {
+                                      e.stopPropagation();
+
+                                      if (currentOrg?.scimEnabled) {
+                                        createNotification({
+                                          text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
+                                          type: "error"
+                                        });
+                                        return;
                                      }
-                                      onClick={(e) => {
-                                        onResendInvite(orgMembershipId);
-                                        e.stopPropagation();
-                                      }}
-                                    >
-                                      Resend Invite
-                                    </Button>
-                                  )}
-                                </OrgPermissionCan>
-                              )}
-                            <DropdownMenu>
-                              <DropdownMenuTrigger asChild>
-                                <IconButton
-                                  ariaLabel="Options"
-                                  colorSchema="secondary"
-                                  className={twMerge("w-6", userId === u?.id && "opacity-50")}
-                                  variant="plain"
-                                  isDisabled={userId === u?.id}
-                                >
-                                  <FontAwesomeIcon icon={faEllipsisV} />
-                                </IconButton>
-                              </DropdownMenuTrigger>
-                              <DropdownMenuContent sideOffset={2} align="end">
-                                <OrgPermissionCan
-                                  I={OrgPermissionActions.Edit}
-                                  a={OrgPermissionSubjects.Member}
-                                >
-                                  {(isAllowed) => (
-                                    <DropdownMenuItem
-                                      onClick={(e) => {
-                                        e.stopPropagation();
-                                        navigate({
-                                          to: "/organization/members/$membershipId" as const,
-                                          params: {
-                                            membershipId: orgMembershipId
-                                          }
+
+                                      if (!isActive) {
+                                        // activate user
+                                        await updateOrgMembership({
+                                          organizationId: orgId,
+                                          membershipId: orgMembershipId,
+                                          isActive: true
                                        });
-                                      }}
-                                      isDisabled={!isAllowed}
-                                      icon={<FontAwesomeIcon icon={faEdit} />}
-                                    >
-                                      Edit User
-                                    </DropdownMenuItem>
-                                  )}
-                                </OrgPermissionCan>
-                                <OrgPermissionCan
-                                  I={OrgPermissionActions.Delete}
-                                  a={OrgPermissionSubjects.Member}
-                                >
-                                  {(isAllowed) => (
-                                    <DropdownMenuItem
-                                      icon={<FontAwesomeIcon icon={faUserSlash} />}
-                                      onClick={async (e) => {
-                                        e.stopPropagation();

-                                        if (currentOrg?.scimEnabled) {
-                                          createNotification({
-                                            text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
-                                            type: "error"
-                                          });
-                                          return;
-                                        }
+                                        return;
+                                      }

-                                        if (!isActive) {
-                                          // activate user
-                                          await updateOrgMembership({
-                                            organizationId: orgId,
-                                            membershipId: orgMembershipId,
-                                            isActive: true
-                                          });
+                                      // deactivate user
+                                      handlePopUpOpen("deactivateMember", {
+                                        orgMembershipId,
+                                        username
+                                      });
+                                    }}
+                                    isDisabled={!isAllowed}
+                                  >
+                                    {`${isActive ? "Deactivate" : "Activate"} User`}
+                                  </DropdownMenuItem>
+                                )}
+                              </OrgPermissionCan>
+                              <OrgPermissionCan
+                                I={OrgPermissionActions.Delete}
+                                a={OrgPermissionSubjects.Member}
+                              >
+                                {(isAllowed) => (
+                                  <DropdownMenuItem
+                                    onClick={(e) => {
+                                      e.stopPropagation();

-                                          return;
-                                        }
-
-                                        // deactivate user
-                                        handlePopUpOpen("deactivateMember", {
-                                          orgMembershipId,
-                                          username
+                                      if (currentOrg?.scimEnabled && isActive) {
+                                        createNotification({
+                                          text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
+                                          type: "error"
                                        });
-                                      }}
-                                      isDisabled={!isAllowed}
-                                    >
-                                      {`${isActive ? "Deactivate" : "Activate"} User`}
-                                    </DropdownMenuItem>
-                                  )}
-                                </OrgPermissionCan>
-                                <OrgPermissionCan
-                                  I={OrgPermissionActions.Delete}
-                                  a={OrgPermissionSubjects.Member}
-                                >
-                                  {(isAllowed) => (
-                                    <DropdownMenuItem
-                                      onClick={(e) => {
-                                        e.stopPropagation();
+                                        return;
+                                      }

-                                        if (currentOrg?.scimEnabled && isActive) {
-                                          createNotification({
-                                            text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
-                                            type: "error"
-                                          });
-                                          return;
-                                        }
-
-                                        handlePopUpOpen("removeMember", {
-                                          orgMembershipId,
-                                          username
-                                        });
-                                      }}
-                                      isDisabled={!isAllowed}
-                                      icon={<FontAwesomeIcon icon={faUserXmark} />}
-                                    >
-                                      Remove User
-                                    </DropdownMenuItem>
-                                  )}
-                                </OrgPermissionCan>
-                              </DropdownMenuContent>
-                            </DropdownMenu>
-                          </div>
-                        </Td>
-                      </Tr>
-                    );
-                  }
-                )}
+                                      handlePopUpOpen("removeMember", {
+                                        orgMembershipId,
+                                        username
+                                      });
+                                    }}
+                                    isDisabled={!isAllowed}
+                                    icon={<FontAwesomeIcon icon={faUserXmark} />}
+                                  >
+                                    Remove User
+                                  </DropdownMenuItem>
+                                )}
+                              </OrgPermissionCan>
+                            </DropdownMenuContent>
+                          </DropdownMenu>
+                        </div>
+                      </Td>
+                    </Tr>
+                  );
+                }
+              )}
          </TBody>
        </Table>
-        {Boolean(filteredUsers.length) && (
+        {Boolean(filteredMembers.length) && (
          <Pagination
-            count={filteredUsers.length}
+            count={filteredMembers.length}
            page={page}
            perPage={perPage}
            onChangePage={setPage}
            onChangePerPage={handlePerPageChange}
          />
        )}
-        {!isMembersLoading && !filteredUsers?.length && (
+        {!isMembersLoading && !filteredMembers?.length && (
          <EmptyState
            title={
              members.length
--- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserDetailsSection.tsx
+++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserDetailsSection.tsx
@@ -120,7 +120,7 @@ export const UserDetailsSection = ({ membershipId, handlePopUpOpen }: Props) =>
        <div className="mb-4">
          <p className="text-sm font-semibold text-mineshaft-300">Username</p>
          <div className="group flex align-top">
-            <p className="text-sm text-mineshaft-300">{membership.user.username}</p>
+            <p className="break-all text-sm text-mineshaft-300">{membership.user.username}</p>
            <div className="opacity-0 transition-opacity duration-300 group-hover:opacity-100">
              <Tooltip content={copyTextUsername}>
                <IconButton
@@ -141,19 +141,22 @@ export const UserDetailsSection = ({ membershipId, handlePopUpOpen }: Props) =>
        <div className="mb-4">
          <p className="text-sm font-semibold text-mineshaft-300">Email</p>
          <div className="flex items-center">
-            <p className="mr-2 text-sm text-mineshaft-300">{membership.user.email ?? "-"}</p>
-            <Tooltip
-              content={
-                membership.user.isEmailVerified
-                  ? "Email has been verified"
-                  : "Email has not been verified"
-              }
-            >
-              <FontAwesomeIcon
-                size="sm"
-                icon={membership.user.isEmailVerified ? faCheckCircle : faCircleXmark}
-              />
-            </Tooltip>
+            <p className="mr-2 break-all text-sm text-mineshaft-300">
+              {membership.user.email ?? "-"}{" "}
+              <Tooltip
+                content={
+                  membership.user.isEmailVerified
+                    ? "Email has been verified"
+                    : "Email has not been verified"
+                }
+              >
+                <FontAwesomeIcon
+                  size="sm"
+                  icon={membership.user.isEmailVerified ? faCheckCircle : faCircleXmark}
+                  className={membership.user.isEmailVerified ? "text-green" : "text-red"}
+                />
+              </Tooltip>
+            </p>
          </div>
        </div>
        <div className="mb-4">
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SelectionPanel/SelectionPanel.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SelectionPanel/SelectionPanel.tsx
@@ -1,11 +1,11 @@
 import { useMemo } from "react";
 import { subject } from "@casl/ability";
-import { faAnglesRight, faMinusSquare, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faAnglesRight, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";

 import { createNotification } from "@app/components/notifications";
-import { Button, DeleteActionModal, IconButton, Tooltip } from "@app/components/v2";
+import { Button, DeleteActionModal, Tooltip } from "@app/components/v2";
 import {
  ProjectPermissionActions,
  ProjectPermissionSub,
@@ -221,12 +221,14 @@ export const SelectionPanel = ({
        )}
      >
        <div className="mt-3.5 flex items-center rounded-md border border-mineshaft-600 bg-mineshaft-800 px-4 py-2 text-bunker-300">
-          <Tooltip content="Clear">
-            <IconButton variant="plain" ariaLabel="clear-selection" onClick={resetSelectedEntries}>
-              <FontAwesomeIcon icon={faMinusSquare} size="lg" />
-            </IconButton>
-          </Tooltip>
-          <div className="ml-1 flex-grow px-2 text-sm">{selectedCount} Selected</div>
+          <div className="mr-2 text-sm">{selectedCount} Selected</div>
+          <button
+            type="button"
+            className="mr-auto text-xs text-mineshaft-400 underline-offset-2 hover:text-mineshaft-200 hover:underline"
+            onClick={resetSelectedEntries}
+          >
+            Unselect All
+          </button>
          {isRotatedSecretSelected && (
            <span className="text-sm text-mineshaft-400">
              Rotated Secrets will not be affected by action.
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx
@@ -16,7 +16,6 @@ import {
  faFolderPlus,
  faKey,
  faLock,
-  faMinusSquare,
  faPaste,
  faPlus,
  faRotate,
@@ -1061,14 +1060,14 @@ export const ActionBar = ({
        )}
      >
        <div className="mt-3.5 flex items-center rounded-md border border-mineshaft-600 bg-mineshaft-800 px-4 py-2 text-bunker-300">
-          <Tooltip content="Clear">
-            <IconButton variant="plain" ariaLabel="clear-selection" onClick={resetSelectedSecret}>
-              <FontAwesomeIcon icon={faMinusSquare} size="lg" />
-            </IconButton>
-          </Tooltip>
-          <div className="ml-2 flex-grow px-2 text-sm">
-            {Object.keys(selectedSecrets).length} Selected
-          </div>
+          <div className="mr-2 text-sm">{Object.keys(selectedSecrets).length} Selected</div>
+          <button
+            type="button"
+            className="mr-auto text-xs text-mineshaft-400 underline-offset-2 hover:text-mineshaft-200 hover:underline"
+            onClick={resetSelectedSecret}
+          >
+            Unselect All
+          </button>
          <ProjectPermissionCan
            I={ProjectPermissionActions.Delete}
            a={subject(ProjectPermissionSub.Secrets, {