diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx
index 4ae12c6c..9b14bfcf 100644
--- a/src/components/Expenses/ManageExpense.jsx
+++ b/src/components/Expenses/ManageExpense.jsx
@@ -327,6 +327,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               control={control}
               name="paidById"
               projectId={null}
+              forAll={expenseToEdit ? true : false}
             />
           </div>
         </div>
diff --git a/src/components/Organization/OrganizationsList.jsx b/src/components/Organization/OrganizationsList.jsx
index 6e170a2f..af981025 100644
--- a/src/components/Organization/OrganizationsList.jsx
+++ b/src/components/Organization/OrganizationsList.jsx
@@ -23,7 +23,7 @@ const OrganizationsList = ({searchText}) => {
       label: "Organization Name",
       getValue: (org) => (
         <div className="d-flex gap-2 py-1 ">
-          <i class="bx bx-buildings"></i>
+          <i className="bx bx-buildings"></i>
           <span
             className="text-truncate d-inline-block "
             style={{ maxWidth: "150px" }}
diff --git a/src/components/common/EmployeeSearchInput.jsx b/src/components/common/EmployeeSearchInput.jsx
index f1121e6b..34fdecaa 100644
--- a/src/components/common/EmployeeSearchInput.jsx
+++ b/src/components/common/EmployeeSearchInput.jsx
@@ -4,10 +4,13 @@ import { useDebounce } from "../../utils/appUtils";
 import { useController } from "react-hook-form";
 import Avatar from "./Avatar";
 
-
-
-
-const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
+const EmployeeSearchInput = ({
+  control,
+  name,
+  projectId,
+  placeholder,
+  forAll,
+}) => {
   const {
     field: { onChange, value, ref },
     fieldState: { error },
@@ -17,17 +20,20 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
   const [showDropdown, setShowDropdown] = useState(false);
   const debouncedSearch = useDebounce(search, 500);
 
-  const {
-    data: employees,
-    isLoading,
-  } = useEmployeesName(projectId, debouncedSearch);
+  const { data: employees, isLoading } = useEmployeesName(
+    projectId,
+    debouncedSearch,
+    forAll
+  );
 
   useEffect(() => {
-    if (value && !search) {
-      const found = employees?.data?.find((emp) => emp.id === value);
-      if (found) setSearch(found.firstName + " " + found.lastName);
+    if (value && employees?.data) {
+      const found = employees.data.find((emp) => emp.id === value);
+      if (found && forAll) {
+        setSearch(found.firstName + " " + found.lastName);
+      }
     }
-  }, [value, employees]);
+  }, [value, employees?.data]);
 
   const handleSelect = (employee) => {
     onChange(employee.id);
@@ -46,7 +52,7 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
         onChange={(e) => {
           setSearch(e.target.value);
           setShowDropdown(true);
-          onChange(""); 
+          onChange("");
         }}
         onFocus={() => {
           if (search) setShowDropdown(true);
@@ -61,28 +67,27 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
           {isLoading ? (
             <li className="list-group-item">
               <a>Searching...</a>
-              
             </li>
           ) : (
             employees?.data?.map((emp) => (
-             <li
-        key={emp.id}
-        className="list-group-item list-group-item-action py-1 px-1"
-        style={{ cursor: "pointer" }}
-        onClick={() => handleSelect(emp)}
-      >
-        <div className="d-flex align-items-center px-0">
-          <Avatar
-            size="xs"
-            classAvatar="m-0 me-2"
-            firstName={emp.firstName}
-            lastName={emp.lastName}
-          />
-          <span className="text-muted">
-            {`${emp?.firstName} ${emp?.lastName}`.trim()}
-          </span>
-        </div>
-      </li>
+              <li
+                key={emp.id}
+                className="list-group-item list-group-item-action py-1 px-1"
+                style={{ cursor: "pointer" }}
+                onClick={() => handleSelect(emp)}
+              >
+                <div className="d-flex align-items-center px-0">
+                  <Avatar
+                    size="xs"
+                    classAvatar="m-0 me-2"
+                    firstName={emp.firstName}
+                    lastName={emp.lastName}
+                  />
+                  <span className="text-muted">
+                    {`${emp?.firstName} ${emp?.lastName}`.trim()}
+                  </span>
+                </div>
+              </li>
             ))
           )}
         </ul>
diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index 477b18f7..2b37e0de 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -184,11 +184,11 @@ export const useEmployeeProfile = (employeeId) => {
   };
 };
 
-export const useEmployeesName = (projectId, search) => {
+export const useEmployeesName = (projectId, search,allEmployee) => {
   return useQuery({
-    queryKey: ["employees", projectId, search],
+    queryKey: ["employees", projectId, search,allEmployee],
     queryFn: async () =>
-      await EmployeeRepository.getEmployeeName(projectId, search),
+      await EmployeeRepository.getEmployeeName(projectId, search,allEmployee),
 
     staleTime: 5 * 60 * 1000, // Optional: cache for 5 minutes
   });
diff --git a/src/pages/authentication/SwitchTenant.jsx b/src/pages/authentication/SwitchTenant.jsx
index b5a8652a..028414cb 100644
--- a/src/pages/authentication/SwitchTenant.jsx
+++ b/src/pages/authentication/SwitchTenant.jsx
@@ -86,7 +86,7 @@ const SwitchTenant = () => {
                 <button
                   className={` ${currentTenant === tenant.id ? "badge bg-label-primary w-50" :"btn btn-primary btn-sm mt-2 align-self-start" }`}
                   onClick={() => handleTenantselection(tenant?.id)}
-                  disabled={isPending && pendingTenant === tenant.id || currentTenant === tenant.id }
+                  disabled={isPending && pendingTenant === tenant.id || currentTenant === tenant.id || isPending}
                 >
                   {currentTenant === tenant.id  ?  "Active Tenant" :isPending && pendingTenant === tenant.id
                     ? "Please Wait.."
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index 931c7c51..d257825b 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -11,11 +11,12 @@ const EmployeeRepository = {
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
   getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
   deleteEmployee: (id,active) => api.delete(`/api/employee/${id}?active=${active}`),
- getEmployeeName: (projectId, search) => {
+ getEmployeeName: (projectId, search,allEmployee) => {
   const params = new URLSearchParams();
 
   if (projectId) params.append("projectId", projectId);
   if (search) params.append("searchString", search);
+  if(allEmployee) params.append("allEmployee",allEmployee)
 
   const query = params.toString();
   return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);
diff --git a/src/router/ProtectedRoute.jsx b/src/router/ProtectedRoute.jsx
index d174652c..cfd7409d 100644
--- a/src/router/ProtectedRoute.jsx
+++ b/src/router/ProtectedRoute.jsx
@@ -59,7 +59,7 @@ const attemptTokenRefresh = async (storedRefreshToken) => {
 
     return true;
   } catch (error) {
-    console.error("Token refresh failed:", error);
+      
     return false;
   }
 };