diff --git a/src/components/Users/UserDepartmentsTab.tsx b/src/components/Users/UserDepartmentsTab.tsx
index 1daa8d10751..ff4d69a5214 100644
--- a/src/components/Users/UserDepartmentsTab.tsx
+++ b/src/components/Users/UserDepartmentsTab.tsx
@@ -7,6 +7,7 @@ import CareIcon from "@/CAREUI/icons/CareIcon";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
 
 import { CardGridSkeleton } from "@/components/Common/SkeletonLoading";
 
@@ -14,6 +15,7 @@ import { userChildProps } from "@/components/Common/UserColumns";
 import LinkUserToDepartmentSheet from "@/components/Users/LinkUserToDepartmentSheet";
 
 import query from "@/Utils/request/query";
+import useFilters from "@/hooks/useFilters";
 import EditFacilityUserRoleSheet from "@/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet";
 import useCurrentFacility from "@/pages/Facility/utils/useCurrentFacility";
 import {
@@ -113,31 +115,32 @@ function DepartmentCard({
 export default function UserDepartmentsTab({ userData }: userChildProps) {
   const { t } = useTranslation();
   const { facilityId } = useCurrentFacility();
+  const { qParams, updateQuery, Pagination, resultsPerPage } = useFilters({
+    limit: 15,
+    disableCache: true,
+  });
 
   const { data: departmentsData, isLoading } = useQuery({
-    queryKey: ["facilityOrganizations", "byUser", facilityId, userData.id],
-    queryFn: query(facilityOrganizationApi.list, {
+    queryKey: [
+      "facilityOrganizations",
+      "byUser",
+      facilityId,
+      userData.id,
+      qParams,
+      resultsPerPage,
+    ],
+    queryFn: query.debounced(facilityOrganizationApi.list, {
       pathParams: { facilityId: facilityId! },
       queryParams: {
         containing_user: userData.id,
+        name: qParams.name || undefined,
+        limit: resultsPerPage,
+        offset: ((qParams.page || 1) - 1) * resultsPerPage,
       },
     }),
     enabled: !!facilityId,
   });
 
-  if (isLoading) {
-    return (
-      <div className="mt-8 space-y-4">
-        <h3 className="text-lg font-semibold text-gray-900 mb-4">
-          {t("departments")}
-        </h3>
-        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-          <CardGridSkeleton count={6} />
-        </div>
-      </div>
-    );
-  }
-
   const departments = departmentsData?.results ?? [];
 
   return (
@@ -151,27 +154,49 @@ export default function UserDepartmentsTab({ userData }: userChildProps) {
           facilityId={facilityId}
         />
       </div>
-
-      {departments.length === 0 ? (
+      <Input
+        placeholder={t("search_departments_placeholder")}
+        aria-label={t("search_departments_placeholder")}
+        value={qParams.name || ""}
+        onChange={(e) => updateQuery({ name: e.target.value || undefined })}
+        className="w-full max-w-sm"
+      />
+
+      {isLoading ? (
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          <CardGridSkeleton count={6} />
+        </div>
+      ) : departments.length === 0 ? (
         <div className="flex flex-col items-center justify-center py-12 border border-dashed border-gray-300 rounded-lg">
           <CareIcon icon="l-building" className="h-16 w-16 text-gray-400" />
-          <p className="mt-4 text-lg font-medium text-gray-600">
-            {t("no_departments_assigned")}
-          </p>
-          <p className="mt-2 text-sm text-gray-500">
-            {t("click_link_department_to_get_started")}
-          </p>
+          {qParams.name ? (
+            <p className="mt-4 text-lg font-medium text-gray-600">
+              {t("no_departments_found")}
+            </p>
+          ) : (
+            <>
+              <p className="mt-4 text-lg font-medium text-gray-600">
+                {t("no_departments_assigned")}
+              </p>
+              <p className="mt-2 text-sm text-gray-500">
+                {t("click_link_department_to_get_started")}
+              </p>
+            </>
+          )}
         </div>
       ) : (
-        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-          {departments.map((department) => (
-            <DepartmentCard
-              key={department.id}
-              department={department}
-              userData={userData}
-              facilityId={facilityId}
-            />
-          ))}
+        <div>
+          <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+            {departments.map((department) => (
+              <DepartmentCard
+                key={department.id}
+                department={department}
+                userData={userData}
+                facilityId={facilityId}
+              />
+            ))}
+          </div>
+          <Pagination totalCount={departmentsData?.count ?? 0} />
         </div>
       )}
     </div>
diff --git a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
index 2ac4be57d5d..32d7126291e 100644
--- a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
@@ -40,7 +40,9 @@ export default function EditUserRoleSheet({
 }: Props) {
   const queryClient = useQueryClient();
   const [open, setOpen] = useState(false);
-  const [selectedRole, setSelectedRole] = useState<RoleBase>();
+  const [selectedRole, setSelectedRole] = useState<RoleBase>({
+    ...userRole.role,
+  });
   const [showRemoveDialog, setShowRemoveDialog] = useState(false);
   const { t } = useTranslation();