diff --git a/src/components/RecurringExpense/ManageRecurringExpense.jsx b/src/components/RecurringExpense/ManageRecurringExpense.jsx
index 4ae96a8f..44232afe 100644
--- a/src/components/RecurringExpense/ManageRecurringExpense.jsx
+++ b/src/components/RecurringExpense/ManageRecurringExpense.jsx
@@ -7,7 +7,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { defaultRecurringExpense, PaymentRecurringExpense } from './RecurringExpenseSchema';
 import { FREQUENCY_FOR_RECURRING, INR_CURRENCY_CODE } from '../../utils/constants';
 import { useCurrencies, useProjectName } from '../../hooks/useProjects';
-import { useCreateRecurringExpense, useUpdateRecurringExpense } from '../../hooks/useExpense';
+import { useCreateRecurringExpense, usePayee, useUpdateRecurringExpense } from '../../hooks/useExpense';
+import InputSuggestions from '../common/InputSuggestion';
 
 function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
 
@@ -18,8 +19,8 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
     const { data: currencyData, isLoading: currencyLoading, isError: currencyError } = useCurrencies();
 
     const { data: statusData, isLoading: statusLoading, isError: statusError } = useRecurringStatus();
+    const { data: Payees, isLoading: isPayeeLoaing, isError: isPayeeError, error: payeeError } = usePayee()
 
-    
     const {
         ExpenseCategories,
         loading: ExpenseLoading,
@@ -238,7 +239,7 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
 
                 {/* Payee and Currency  */}
                 <div className="row my-2 text-start">
-                    <div className="col-md-6">
+                    {/* <div className="col-md-6">
                         <Label htmlFor="payee" className="form-label" required>
                             Payee (Supplier Name/Transporter Name/Other)
                         </Label>
@@ -254,6 +255,20 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                                 {errors.payee.message}
                             </small>
                         )}
+                    </div> */}
+
+                    <div className="col-md-6">
+                        <Label htmlFor="payee" className="form-label" required>
+                            Payee (Supplier Name/Transporter Name/Other)
+                        </Label>
+                        <InputSuggestions
+                            organizationList={Payees}
+                            value={watch("payee") || ""}
+                            onChange={(val) =>
+                                setValue("payee", val, { shouldValidate: true })
+                            }
+                            error={errors.payee?.message}
+                        />                      
 
                     </div>
 
@@ -289,23 +304,25 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                 {/* Notify To and Status Id  */}
                 <div className="row my-2 text-start">
                     <div className="col-md-6">
-                        <Label htmlFor="notifyTo" className="form-label" required>
-                            Notify (E-mail)
+                        <Label htmlFor="frequency" className="form-label" required>
+                            Frequency
                         </Label>
-                        <input
-                            type="text"
-                            id="notifyTo"
-                            className="form-control form-control-sm"
-                            {...register("notifyTo")}
-
-                        />
-                        {errors.notifyTo && (
-                            <small className="danger-text">
-                                {errors.notifyTo.message}
-                            </small>
+                        <select
+                            id="frequency"
+                            className="form-select form-select-sm"
+                            {...register("frequency", { valueAsNumber: true })}
+                        >
+                            <option value="">Select Frequency</option>
+                            {Object.entries(FREQUENCY_FOR_RECURRING).map(([key, label]) => (
+                                <option key={key} value={key}>
+                                    {label}
+                                </option>
+                            ))}
+                        </select>
+                        {errors.frequency && (
+                            <small className="danger-text">{errors.frequency.message}</small>
                         )}
                     </div>
-
                     <div className="col-md-6">
                         <Label htmlFor="statusId" className="form-label" required>
                             Status
@@ -369,27 +386,26 @@ function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
                 {/* Frequency */}
 
 
-                <div className="col-md-6 text-start">
-                    <Label htmlFor="frequency" className="form-label" required>
-                        Frequency
-                    </Label>
-                    <select
-                        id="frequency"
-                        className="form-select form-select-sm"
-                        {...register("frequency", { valueAsNumber: true })}
-                    >
-                        <option value="">Select Frequency</option>
-                        {Object.entries(FREQUENCY_FOR_RECURRING).map(([key, label]) => (
-                            <option key={key} value={key}>
-                                {label}
-                            </option>
-                        ))}
-                    </select>
-                    {errors.frequency && (
-                        <small className="danger-text">{errors.frequency.message}</small>
-                    )}
-                </div>
 
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="notifyTo" className="form-label" required>
+                            Notify (E-mail)
+                        </Label>
+                        <input
+                            type="text"
+                            id="notifyTo"
+                            className="form-control form-control-sm"
+                            {...register("notifyTo")}
+
+                        />
+                        {errors.notifyTo && (
+                            <small className="danger-text">
+                                {errors.notifyTo.message}
+                            </small>
+                        )}
+                    </div>
+                </div>
 
                 {/* Description  */}
                 <div className="row my-2 text-start">
diff --git a/src/components/RecurringExpense/RecurringExpenseSchema.js b/src/components/RecurringExpense/RecurringExpenseSchema.js
index 7c5e3b9e..0e45e5d8 100644
--- a/src/components/RecurringExpense/RecurringExpenseSchema.js
+++ b/src/components/RecurringExpense/RecurringExpenseSchema.js
@@ -1,65 +1,16 @@
 import { boolean, z } from "zod";
 import { INR_CURRENCY_CODE } from "../../utils/constants";
 
-// export const PaymentRecurringExpense = (expenseTypes) => {
-//   return z
-//     .object({
-//       title: z.string().min(1, { message: "Project is required" }),
-
-//        description: z.string().min(1, { message: "Description is required" }),
-
-//         payee: z.string().min(1, { message: "Supplier name is required" }),    
-
-//       notifyTo: z.string().min(1, { message: "Notification is required" }),
-
-//       currencyId: z
-//         .string()
-//         .min(1, { message: "Currency is required" }),    
-
-//      amount: z.coerce
-//         .number({
-//           invalid_type_error: "Amount is required and must be a number",
-//         })
-//         .min(1, "Amount must be Enter")
-//         .refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
-//           message: "Amount must have at most 2 decimal places",
-//         }),    
-
-//      strikeDate: z.string().min(1, { message: "Date is required" }),
-
-//        projectId: z.string().min(1, { message: "Project is required" }),
-
-//         paymentBufferDays: z.string().min(1, { message: "Buffer days is required" }),
-
-//         numberOfIteration: z.string().min(1, { message: "Iteration is required" }),
-
-//       expenseCategoryId: z
-//         .string()
-//         .min(1, { message: "Expense Category is required" }),         
-      
-//      statusId: z.string().min(1, { message: "Please select a status" }),
-
-//      frequency: z.string().min(1, { message: "Frequency is required" }),
-     
-//       isVariable: z.boolean().optional(),
-      
-//     })
-//   };
-
-
 export const PaymentRecurringExpense = (expenseTypes) => {
   return z.object({
-    title: z.string().min(1, { message: "Project is required" }),
-
-    description: z.string().min(1, { message: "Description is required" }),
-
-    payee: z.string().min(1, { message: "Supplier name is required" }),
-
-    notifyTo: z.string().min(1, { message: "Notification is required" }),
-
+    title: z.string().min(1, { message: "Title is required" }).transform((val) => val.trim()),
+    description: z.string().min(1, { message: "Description is required" }).transform((val) => val.trim()),
+    payee: z.string().min(1, { message: "Payee name is required" }).transform((val) => val.trim()),
+    notifyTo: z.string().min(1, { message: "Notification e-mail is required" }).transform((val) => val.trim()),
     currencyId: z
       .string()
-      .min(1, { message: "Currency is required" }),
+      .min(1, { message: "Currency is required" })
+      .transform((val) => val.trim()),
 
     amount: z
       .number({
@@ -76,11 +27,13 @@ export const PaymentRecurringExpense = (expenseTypes) => {
       .min(1, { message: "Date is required" })
       .refine((val) => !isNaN(Date.parse(val)), {
         message: "Invalid date format",
-      }),
+      })
+      .transform((val) => val.trim()),
 
     projectId: z
       .string()
-      .min(1, { message: "Project is required" }),
+      .min(1, { message: "Project is required" })
+      .transform((val) => val.trim()),
 
     paymentBufferDays: z
       .number({
@@ -98,11 +51,13 @@ export const PaymentRecurringExpense = (expenseTypes) => {
 
     expenseCategoryId: z
       .string()
-      .min(1, { message: "Expense Category is required" }),
+      .min(1, { message: "Expense Category is required" })
+      .transform((val) => val.trim()),
 
     statusId: z
       .string()
-      .min(1, { message: "Please select a status" }),
+      .min(1, { message: "Please select a status" })
+      .transform((val) => val.trim()),
 
     frequency: z
       .number({
@@ -115,6 +70,7 @@ export const PaymentRecurringExpense = (expenseTypes) => {
   });
 };
 
+
 export const defaultRecurringExpense = {
   title: "",
   description: "",