diff --git a/backend/src/services/identity/identity-dal.ts b/backend/src/services/identity/identity-dal.ts
index 596601703..c23e650d0 100644
--- a/backend/src/services/identity/identity-dal.ts
+++ b/backend/src/services/identity/identity-dal.ts
@@ -69,7 +69,7 @@ export const identityDALFactory = (db: TDbClient) => {
         .replicaNode()(TableName.Identity)
         .where((qb) => {
           if (searchTerm) {
-            void qb.whereILike(`${TableName.Identity}.name`, `%${searchTerm}%`);
+            void qb.whereILike(`name`, `%${searchTerm}%`);
           }
         })
         .count("*")
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
index 8cfc697c0..5417636ea 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx
@@ -132,26 +132,24 @@ const IdentityPanelTable = ({
                               </IconButton>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent sideOffset={2} align="end">
-                              {isInstanceAdmin && (
-                                <DropdownMenuItem
-                                  onClick={(e) => {
-                                    e.stopPropagation();
-                                    handlePopUpOpen("removeServerAdmin", { name, id });
-                                  }}
-                                  icon={
-                                    <div className="relative">
-                                      <FontAwesomeIcon icon={faShieldHalved} />
-                                      <FontAwesomeIcon
-                                        className="absolute -bottom-[0.01rem] -right-1"
-                                        size="2xs"
-                                        icon={faXmark}
-                                      />
-                                    </div>
-                                  }
-                                >
-                                  Remove Server Admin
-                                </DropdownMenuItem>
-                              )}
+                              <DropdownMenuItem
+                                onClick={(e) => {
+                                  e.stopPropagation();
+                                  handlePopUpOpen("removeServerAdmin", { name, id });
+                                }}
+                                icon={
+                                  <div className="relative">
+                                    <FontAwesomeIcon icon={faShieldHalved} />
+                                    <FontAwesomeIcon
+                                      className="absolute -bottom-[0.01rem] -right-1"
+                                      size="2xs"
+                                      icon={faXmark}
+                                    />
+                                  </div>
+                                }
+                              >
+                                Remove Server Admin
+                              </DropdownMenuItem>
                             </DropdownMenuContent>
                           </DropdownMenu>
                         </div>