diff --git a/src/api/auth-identities.tsx b/src/api/auth-identities.tsx
index 3ba6b52c6a..7bf72a5b39 100644
--- a/src/api/auth-identities.tsx
+++ b/src/api/auth-identities.tsx
@@ -51,23 +51,24 @@ export const updateIdentities = (
   });
 };
 
-export const deleteOIDCIdentity = (identity: LxdIdentity) => {
+export const deleteIdentity = (identity: LxdIdentity) => {
   return new Promise((resolve, reject) => {
-    fetch(`/1.0/auth/identities/oidc/${identity.id}`, {
-      method: "DELETE",
-    })
+    fetch(
+      `/1.0/auth/identities/${identity.authentication_method}/${identity.id}`,
+      {
+        method: "DELETE",
+      },
+    )
       .then(handleResponse)
       .then(resolve)
       .catch(reject);
   });
 };
 
-export const deleteOIDCIdentities = (
-  identities: LxdIdentity[],
-): Promise<void> => {
+export const deleteIdentities = (identities: LxdIdentity[]): Promise<void> => {
   return new Promise((resolve, reject) => {
     void Promise.allSettled(
-      identities.map((identity) => deleteOIDCIdentity(identity)),
+      identities.map((identity) => deleteIdentity(identity)),
     )
       .then(handleSettledResult)
       .then(resolve)
diff --git a/src/components/IdentityResource.tsx b/src/components/IdentityResource.tsx
new file mode 100644
index 0000000000..f25007494a
--- /dev/null
+++ b/src/components/IdentityResource.tsx
@@ -0,0 +1,22 @@
+import { FC } from "react";
+import { LxdIdentity } from "types/permissions";
+import ResourceLabel from "./ResourceLabel";
+
+interface Props {
+  identity: LxdIdentity;
+  truncate?: boolean;
+}
+
+const IdentityResource: FC<Props> = ({ identity, truncate }) => {
+  const identityIconType =
+    identity.authentication_method == "tls" ? "certificate" : "oidc-identity";
+
+  return (
+    <ResourceLabel
+      type={identityIconType}
+      value={identity.type}
+      truncate={truncate}
+    />
+  );
+};
+export default IdentityResource;
diff --git a/src/components/ResourceLabel.tsx b/src/components/ResourceLabel.tsx
index 1d7a40f372..ca6cbccce8 100644
--- a/src/components/ResourceLabel.tsx
+++ b/src/components/ResourceLabel.tsx
@@ -1,16 +1,18 @@
 import { FC } from "react";
 import ResourceIcon, { ResourceIconType } from "./ResourceIcon";
+import classNames from "classnames";
 
 interface Props {
   type: ResourceIconType;
   value: string;
   bold?: boolean;
+  truncate?: boolean;
 }
 
-const ResourceLabel: FC<Props> = ({ type, value, bold }) => {
+const ResourceLabel: FC<Props> = ({ type, value, bold, truncate = true }) => {
   const ValueWrapper = bold ? "strong" : "span";
   return (
-    <span className="resource-label u-truncate">
+    <span className={classNames("resource-label", { "u-truncate": truncate })}>
       <ResourceIcon type={type} />
       <ValueWrapper>{value}</ValueWrapper>
     </span>
diff --git a/src/pages/permissions/PermissionIdentities.tsx b/src/pages/permissions/PermissionIdentities.tsx
index b07858ea8f..dc66e0698b 100644
--- a/src/pages/permissions/PermissionIdentities.tsx
+++ b/src/pages/permissions/PermissionIdentities.tsx
@@ -33,6 +33,8 @@ import Tag from "components/Tag";
 import BulkDeleteIdentitiesBtn from "./actions/BulkDeleteIdentitiesBtn";
 import DeleteIdentityBtn from "./actions/DeleteIdentityBtn";
 import { useSupportedFeatures } from "context/useSupportedFeatures";
+import { isUnrestricted } from "util/helpers";
+import IdentityResource from "components/IdentityResource";
 
 const PermissionIdentities: FC = () => {
   const notify = useNotify();
@@ -52,12 +54,10 @@ const PermissionIdentities: FC = () => {
   const { hasAccessManagementTLS } = useSupportedFeatures();
 
   useEffect(() => {
-    const validIdentities = new Set(
-      identities.map((identity) => identity.name),
-    );
+    const validIdentityIds = new Set(identities.map((identity) => identity.id));
 
     const validSelections = selectedIdentityIds.filter((identity) =>
-      validIdentities.has(identity),
+      validIdentityIds.has(identity),
     );
 
     if (validSelections.length !== selectedIdentityIds.length) {
@@ -114,9 +114,9 @@ const PermissionIdentities: FC = () => {
 
   const rows = filteredIdentities.map((identity) => {
     const isLoggedInIdentity = settings?.auth_user_name === identity.id;
-    const isTlsIdentity = identity.authentication_method === "tls";
+
     return {
-      name: isTlsIdentity ? "" : identity.id,
+      name: isUnrestricted(identity) ? "" : identity.id,
       key: identity.id,
       className: "u-row",
       columns: [
@@ -144,7 +144,7 @@ const PermissionIdentities: FC = () => {
           "aria-label": "Auth method",
         },
         {
-          content: identity.type,
+          content: <IdentityResource identity={identity} truncate={false} />,
           role: "cell",
           "aria-label": "Type",
           className: "u-truncate",
@@ -157,10 +157,11 @@ const PermissionIdentities: FC = () => {
           "aria-label": "Groups for this identity",
         },
         {
-          content: !isTlsIdentity && (
+          content: !isUnrestricted(identity) && (
             <>
               <Button
                 appearance="base"
+                className="u-no-margin--bottom"
                 hasIcon
                 dense
                 onClick={() => {
@@ -198,10 +199,8 @@ const PermissionIdentities: FC = () => {
     defaultSort: "name",
   });
 
-  // NOTE: tls user group membership cannot be modified, this will be supported in the future
-  const nonTlsUsers = identities.filter((identity) => {
-    const isTlsIdentity = identity.authentication_method === "tls";
-    return !isTlsIdentity;
+  const fineGrainedIdentities = identities.filter((identity) => {
+    return !isUnrestricted(identity);
   });
 
   if (isLoading) {
@@ -218,11 +217,11 @@ const PermissionIdentities: FC = () => {
     if (selectedIdentityIds.length > 0) {
       return (
         <SelectedTableNotification
-          totalCount={nonTlsUsers.length ?? 0}
-          itemName="OIDC identity"
+          totalCount={fineGrainedIdentities.length ?? 0}
+          itemName="identity"
           selectedNames={selectedIdentityIds}
           setSelectedNames={setSelectedIdentityIds}
-          filteredNames={nonTlsUsers.map((item) => item.id)}
+          filteredNames={fineGrainedIdentities.map((item) => item.id)}
           hideActions={!!panelParams.panel}
         />
       );
@@ -294,7 +293,9 @@ const PermissionIdentities: FC = () => {
                 selectedNames={selectedIdentityIds}
                 setSelectedNames={setSelectedIdentityIds}
                 processingNames={[]}
-                filteredNames={nonTlsUsers.map((identity) => identity.id)}
+                filteredNames={fineGrainedIdentities.map(
+                  (identity) => identity.id,
+                )}
                 disableSelect={!!panelParams.panel}
               />
             </TablePagination>
diff --git a/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx b/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx
index 551963d819..b245e222d8 100644
--- a/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx
+++ b/src/pages/permissions/actions/BulkDeleteIdentitiesBtn.tsx
@@ -1,11 +1,11 @@
-import { FC } from "react";
+import { FC, useState } from "react";
 import {
   ButtonProps,
   ConfirmationButton,
   useNotify,
 } from "@canonical/react-components";
 import { LxdIdentity } from "types/permissions";
-import { deleteOIDCIdentities } from "api/auth-identities";
+import { deleteIdentities } from "api/auth-identities";
 import { useQueryClient } from "@tanstack/react-query";
 import { useToastNotification } from "context/toastNotificationProvider";
 import { queryKeys } from "util/queryKeys";
@@ -24,10 +24,12 @@ const BulkDeleteIdentitiesBtn: FC<Props & ButtonProps> = ({
   const notify = useNotify();
   const toastNotify = useToastNotification();
   const buttonText = `Delete ${pluralize("identity", identities.length)}`;
+  const [isLoading, setLoading] = useState(false);
   const successMessage = `${identities.length} ${pluralize("identity", identities.length)} successfully deleted`;
 
   const handleDelete = () => {
-    deleteOIDCIdentities(identities)
+    setLoading(true);
+    deleteIdentities(identities)
       .then(() => {
         void queryClient.invalidateQueries({
           predicate: (query) => {
@@ -37,10 +39,12 @@ const BulkDeleteIdentitiesBtn: FC<Props & ButtonProps> = ({
           },
         });
         toastNotify.success(successMessage);
+        setLoading(false);
         close();
       })
       .catch((e) => {
         notify.failure(`Identity deletion failed`, e);
+        setLoading(false);
       });
   };
 
@@ -50,6 +54,7 @@ const BulkDeleteIdentitiesBtn: FC<Props & ButtonProps> = ({
       appearance=""
       aria-label="Delete identities"
       className={className}
+      loading={isLoading}
       confirmationModalProps={{
         title: "Confirm delete",
         children: (
diff --git a/src/pages/permissions/actions/DeleteIdentityBtn.tsx b/src/pages/permissions/actions/DeleteIdentityBtn.tsx
index e46de90309..bd172500ae 100644
--- a/src/pages/permissions/actions/DeleteIdentityBtn.tsx
+++ b/src/pages/permissions/actions/DeleteIdentityBtn.tsx
@@ -1,4 +1,4 @@
-import { FC } from "react";
+import { FC, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 import { queryKeys } from "util/queryKeys";
 import {
@@ -9,8 +9,8 @@ import {
 import { useToastNotification } from "context/toastNotificationProvider";
 import { LxdIdentity } from "types/permissions";
 import ItemName from "components/ItemName";
-import { deleteOIDCIdentity } from "api/auth-identities";
-import ResourceLabel from "components/ResourceLabel";
+import { deleteIdentity } from "api/auth-identities";
+import IdentityResource from "components/IdentityResource";
 
 interface Props {
   identity: LxdIdentity;
@@ -20,9 +20,11 @@ const DeleteIdentityBtn: FC<Props> = ({ identity }) => {
   const queryClient = useQueryClient();
   const notify = useNotify();
   const toastNotify = useToastNotification();
+  const [isDeleting, setDeleting] = useState(false);
 
   const handleDelete = () => {
-    deleteOIDCIdentity(identity)
+    setDeleting(true);
+    deleteIdentity(identity)
       .then(() => {
         void queryClient.invalidateQueries({
           predicate: (query) => {
@@ -33,27 +35,28 @@ const DeleteIdentityBtn: FC<Props> = ({ identity }) => {
         });
         toastNotify.success(
           <>
-            Identity <ResourceLabel type={"idp-group"} value={identity.name} />{" "}
-            deleted.
+            Identity <IdentityResource identity={identity} /> deleted.
           </>,
         );
+        setDeleting(false);
         close();
       })
       .catch((e) => {
+        setDeleting(false);
         notify.failure(
           `Identity deletion failed`,
           e,
-          <ResourceLabel type={"idp-group"} value={identity.name} />,
+          <IdentityResource identity={identity} />,
         );
       });
   };
 
   return (
     <ConfirmationButton
-      onHoverText={"Delete identity"}
+      onHoverText="Delete identity"
       appearance="base"
       aria-label="Delete identity"
-      className={"has-icon"}
+      className="has-icon u-no-margin--bottom"
       confirmationModalProps={{
         title: "Confirm delete",
         children: (
@@ -68,6 +71,7 @@ const DeleteIdentityBtn: FC<Props> = ({ identity }) => {
       }}
       shiftClickEnabled
       showShiftClickHint
+      loading={isDeleting}
     >
       <Icon name="delete" />
     </ConfirmationButton>
diff --git a/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx b/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx
index efe0b7d3b3..118c46a243 100644
--- a/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx
+++ b/src/pages/permissions/panels/EditGroupIdentitiesPanel.tsx
@@ -27,6 +27,7 @@ import PermissionIdentitiesFilter, {
 import NotificationRow from "components/NotificationRow";
 import ScrollableContainer from "components/ScrollableContainer";
 import useSortTableData from "util/useSortTableData";
+import { isUnrestricted } from "util/helpers";
 
 type IdentityEditHistory = {
   identitiesAdded: Set<string>;
@@ -75,15 +76,15 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
     }
   }, [groups]);
 
-  const nonTlsIdentities = identities.filter(
-    (identity) => identity.authentication_method !== "tls",
+  const fineGrainedIdentities = identities.filter(
+    (identity) => !isUnrestricted(identity),
   );
 
   const {
     identityIdsInAllGroups,
     identityIdsInNoGroups,
     identityIdsInSomeGroups,
-  } = getCurrentIdentitiesForGroups(groups, nonTlsIdentities);
+  } = getCurrentIdentitiesForGroups(groups, fineGrainedIdentities);
 
   const selectedIdentities = new Set<string>(desiredState.identitiesAdded);
   for (const identity of identityIdsInAllGroups) {
@@ -131,7 +132,7 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
       saveToPanelHistory({
         identitiesAdded: new Set(),
         identitiesRemoved: new Set(
-          nonTlsIdentities.map((identity) => identity.id),
+          fineGrainedIdentities.map((identity) => identity.id),
         ),
       });
     } else {
@@ -191,7 +192,7 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
     authMethod: searchParams.getAll(AUTH_METHOD),
   };
 
-  const filteredIdentities = nonTlsIdentities.filter((identity) => {
+  const filteredIdentities = fineGrainedIdentities.filter((identity) => {
     if (
       !filters.queries.every(
         (q) =>
@@ -269,7 +270,7 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
         selectedNames={Array.from(selectedIdentities)}
         setSelectedNames={modifyIdentities}
         processingNames={[]}
-        filteredNames={nonTlsIdentities.map((identity) => identity.id)}
+        filteredNames={fineGrainedIdentities.map((identity) => identity.id)}
         indeterminateNames={Array.from(indeterminateIdentities)}
         onToggleRow={toggleRow}
         hideContextualMenu
@@ -334,7 +335,7 @@ const EditGroupIdentitiesPanel: FC<Props> = ({ groups }) => {
           selectedGroups={groups}
           addedIdentities={desiredState.identitiesAdded}
           removedIdentities={desiredState.identitiesRemoved}
-          allIdentities={nonTlsIdentities}
+          allIdentities={fineGrainedIdentities}
         />
       )}
     </>
diff --git a/src/pages/permissions/panels/EditIdentitiesForm.tsx b/src/pages/permissions/panels/EditIdentitiesForm.tsx
index ed76b0c22f..784d78a7a8 100644
--- a/src/pages/permissions/panels/EditIdentitiesForm.tsx
+++ b/src/pages/permissions/panels/EditIdentitiesForm.tsx
@@ -7,6 +7,7 @@ import SelectableMainTable from "components/SelectableMainTable";
 import { fetchIdentities } from "api/auth-identities";
 import useSortTableData from "util/useSortTableData";
 import { LxdIdentity } from "types/permissions";
+import { isUnrestricted } from "util/helpers";
 
 export type FormIdentity = LxdIdentity & {
   isRemoved?: boolean;
@@ -36,8 +37,8 @@ const EditIdentitiesForm: FC<Props> = ({
     notify.failure("Loading details failed", error);
   }
 
-  const nonTlsIdentities = identities.filter(
-    (identity) => identity.authentication_method !== "tls",
+  const fineGrainedIdentities = identities.filter(
+    (identity) => !isUnrestricted(identity),
   );
 
   const toggleRow = (id: string) => {
@@ -104,7 +105,7 @@ const EditIdentitiesForm: FC<Props> = ({
     },
   ];
 
-  const filteredIdentities = nonTlsIdentities.filter((identity) => {
+  const filteredIdentities = fineGrainedIdentities.filter((identity) => {
     if (filter) {
       return identity.name.toLowerCase().includes(filter.toLowerCase());
     }
@@ -168,7 +169,7 @@ const EditIdentitiesForm: FC<Props> = ({
             .map((identity) => identity.id)}
           setSelectedNames={bulkSelect}
           processingNames={[]}
-          filteredNames={nonTlsIdentities.map((identity) => identity.id)}
+          filteredNames={fineGrainedIdentities.map((identity) => identity.id)}
           indeterminateNames={[]}
           onToggleRow={toggleRow}
           hideContextualMenu
diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx
index 16ee2e5e71..26321d7974 100644
--- a/src/util/helpers.tsx
+++ b/src/util/helpers.tsx
@@ -9,6 +9,7 @@ import crypto from "crypto";
 import { isDiskDevice } from "./devices";
 import { isRootDisk } from "./instanceValidation";
 import { FormDevice } from "./formDevices";
+import { LxdIdentity } from "types/permissions";
 
 export const UNDEFINED_DATE = "0001-01-01T00:00:00Z";
 
@@ -335,3 +336,7 @@ export const getDefaultStoragePool = (profile: LxdProfile) => {
     });
   return rootStorage ? rootStorage.pool : "";
 };
+
+export const isUnrestricted = (identity: LxdIdentity) => {
+  return identity.type === "Client certificate (unrestricted)";
+};
diff --git a/src/util/instanceBulkActions.tsx b/src/util/instanceBulkActions.tsx
index c607dac3d1..8541e38437 100644
--- a/src/util/instanceBulkActions.tsx
+++ b/src/util/instanceBulkActions.tsx
@@ -75,8 +75,8 @@ export const pluralize = (item: string, count: number): string => {
     return item;
   }
 
-  if (item.includes("identity")) {
-    return item.replace("identity", "identities");
+  if (item.toLowerCase().includes("identity")) {
+    return item.toLowerCase().replace("identity", "identities");
   }
 
   return `${item}s`;
diff --git a/tests/permission-identities.spec.ts b/tests/permission-identities.spec.ts
index 2a90133713..f288b5dd91 100644
--- a/tests/permission-identities.spec.ts
+++ b/tests/permission-identities.spec.ts
@@ -92,7 +92,6 @@ test("manage groups for many identities", async ({ page, lxdVersion }) => {
   );
   await page.getByRole("button", { name: "Confirm changes" }).click();
   await page.waitForSelector(`text=Updated groups for 2 identities`);
-  await selectIdentitiesToModify(page, [identityFoo, identityBar]);
   await page.getByLabel("Modify groups").click();
   await toggleGroupsForIdentities(page, [groupOne, groupTwo]);
   await assertTextVisible(page, "2 groups will be modified");