diff --git a/src/Pages/ChangePassword.jsx b/src/Pages/ChangePassword.jsx
index 69ac7dd..d33954b 100644
--- a/src/Pages/ChangePassword.jsx
+++ b/src/Pages/ChangePassword.jsx
@@ -26,6 +26,7 @@ import CustomAlertDialog from "../Components/CustomAlertDialog";
 import ToastBox from "../Components/ToastBox";
 import GlobalStateContext from "../Contexts/GlobalStateContext";
 import CurrencyInput from "../Components/CurrencyInput";
+import { useUpdatePasswordMutation } from "../Services/change.password.service";
 
 const ioNav = yup.object().shape({
   transactionDate: yup.string().required("Date is required"),
@@ -58,7 +59,7 @@ const ChangePassword = ({
   const { IODetails } = useContext(GlobalStateContext);
   const found = data?.find((item) => item?.id === actionId);
 
-  // const [addNavDetails] = useAddNavDetailsMutation()
+  const [updatePassword] = useUpdatePasswordMutation()
   // const {
   //   data
   // } = useGetArtifactsQuery(id)
@@ -73,29 +74,29 @@ const ChangePassword = ({
     resolver: yupResolver(ioNav),
   });
 
-  //   const onSubmit = async (data) => {
-  //     setIsLoading(true);
+    const onSubmit = async (data) => {
+      setIsLoading(true);
 
-  //     try {
-  //       const res = await addNavDetails({ data, id });
-  //       if (res?.data?.statusCode === 201) {
-  //         setIsLoading(false);
-  //         toast({
-  //           render: () => <ToastBox message={res?.data?.message} />,
-  //         });
-  //         handleClose();
-  //       } else if (res?.error?.status === 400) {
-  //         toast({
-  //           render: () => (
-  //             <ToastBox message={res?.error?.data?.message} status={"error"} />
-  //           ),
-  //         });
-  //         handleClose();
-  //       }
-  //     } catch (error) {
-  //       console.log(error);
-  //     }
-  //   };
+      try {
+        const res = await updatePassword({ data});
+        if (res?.data?.statusCode === 201) {
+          setIsLoading(false);
+          toast({
+            render: () => <ToastBox message={res?.data?.message} />,
+          });
+          handleClose();
+        } else if (res?.error?.status === 400) {
+          toast({
+            render: () => (
+              <ToastBox message={res?.error?.data?.message} status={"error"} />
+            ),
+          });
+          handleClose();
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    };
 
   const handleSave = () => {
     handleSubmit(onSubmit)();
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
index 521bab3..255c726 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/IOCashDetails.jsx
@@ -20,6 +20,7 @@ import AddCaseDetails from "./AddCaseDetails";
 import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
 import ToastBox from "../../../../Components/ToastBox";
 import { useParams } from "react-router-dom";
+import { encryptString } from "../../../../Constants/Constants";
 
 const IOCashDetails = () => {
   const params = useParams();
@@ -105,7 +106,7 @@ const IOCashDetails = () => {
             </Tab>
           </TabList>
           {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === import.meta.env.VITE_VITE_MAKER && (
+            ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
                 <Button
                   onClick={handleAdd}
                   leftIcon={<AddIcon />}
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
index 33d0838..06bc1d9 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
@@ -38,6 +38,7 @@ import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
 import AddCaseDetails from "./AddCaseDetails";
+import { encryptString } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -104,7 +105,7 @@ const Pending = () => {
     "Comments",
     "Update By",
     "Update On",
-    ...(localStorage?.getItem('role')!==import.meta.env.VITE_VITE_MAKER ? ["Actions"] : []),
+    ...(localStorage?.getItem('role')!==encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Actions"] : []),
     
   ];
 
@@ -166,7 +167,7 @@ const Pending = () => {
     ),
     Actions: (
       <Box display={"flex"} justifyContent={"center"}>
-        {localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER  ? <Box>
+        {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER)  ? <Box>
           {index===0&&<Box display={"flex"} justifyContent={"center"} gap={2}>
         <Tooltip
           rounded={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
index 49b1319..d9fee12 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/IONAVDetails.jsx
@@ -75,6 +75,7 @@ import ToastBox from "../../../../Components/ToastBox";
 import { useParams } from "react-router-dom";
 import AddNavDetails from "./AddNavDetails";
 import { useUpdateIOCaseMutation } from "../../../../Services/io.service";
+import { encryptString } from "../../../../Constants/Constants";
 
 const IONAVDetails = () => {
   const params = useParams();
@@ -152,7 +153,7 @@ const IONAVDetails = () => {
             </Tab>
           </TabList>
           {IODetails?.isInvestedAmount
-            ? localStorage?.getItem("role") === import.meta.env.VITE_VITE_MAKER && (
+            ? localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && (
                 <Button
                   onClick={handleAdd}
                   leftIcon={<AddIcon />}
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
index 2ea308f..a249bce 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
@@ -22,6 +22,7 @@ import ToastBox from "../../../../Components/ToastBox";
 import AddNavDetails from "./AddNavDetails";
 import RequestApproveModal from "./RequestApproveModal";
 import RequestRejectModal from "./RequestRejectModal";
+import { encryptString } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -90,7 +91,7 @@ const Pending = () => {
     "Investment Closed",
     "Comments",
     "Updated By",
-    ...(localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER ? ["Status"] : []),
+    ...(localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) ? ["Status"] : []),
   ];
 
   const extractedArray = filteredData?.map((item, index) => ({
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
index 3b85cc4..d7d181a 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
@@ -27,6 +27,7 @@ import ViewAmountInvested from "./ViewAmountInvested";
 import ViewDistributionInvestor from "./ViewDistributionInvestor";
 import ViewExit from "./ViewExit";
 import ViewCancel from "./ViewCancel";
+import { encryptString } from "../../../../Constants/Constants";
 
 const formatDate = (date) => new Date(date).toLocaleDateString();
 
@@ -195,7 +196,7 @@ const Pending = () => {
               }
             }}
           >
-            {localStorage?.getItem("role") === import.meta.env.VITE_VITE_MAKER ?  <ViewIcon me={"4px"} /> : null} {localStorage?.getItem("role") === import.meta.env.VITE_VITE_MAKER ?  "View" : "Approve / Reject"}
+            {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ?  <ViewIcon me={"4px"} /> : null} {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) ?  "View" : "Approve / Reject"}
           </Button>
         </Box>
       ),
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
index 18aba78..6c8cdbc 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
@@ -27,6 +27,7 @@ import CurrencyInput from "../../../../Components/CurrencyInput";
 import RequestRejectModal from "./RequestRejectModal";
 import ApproveInvestedModal from "./ApproveInvestedModal";
 import { formatDate } from "../../../Master/Sponser/Sponsers";
+import { encryptString } from "../../../../Constants/Constants";
 
 // Validation schema
 const validationSchema = yup.object().shape({
@@ -236,7 +237,7 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
               />
             </FormControl>
 
-            {localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER && <ModalFooter>
+            {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter>
               <Box display={"flex"} justifyContent={"center"} gap={2}>
                 <Button
                   rounded={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
index 8b49537..a829be5 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
@@ -35,6 +35,7 @@ import {
   import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 import ApprovedCancelTransaction from "./ApprovedCancelTransaction";
 import RequestRejectModal from "./RequestRejectModal";
+import { encryptString } from "../../../../Constants/Constants";
   
   const ViewCancel = ({ isOpen, onClose,id:cancleId }) => {
     const params = useParams();
@@ -311,7 +312,7 @@ import RequestRejectModal from "./RequestRejectModal";
               data={extractedArray}
             />
           </ModalBody>
-          {localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER && <ModalFooter pt={0}>
+          {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter pt={0}>
             <Box display={"flex"} justifyContent={"center"} gap={2}>
                 <Button
                   rounded={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
index 38d4d69..dddd11e 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
@@ -23,6 +23,7 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 import ApproveDistrubationModal from "./ApproveDistrubationModal";
 import RequestRejectModal from "./RequestRejectModal";
+import { encryptString } from "../../../../Constants/Constants";
 
 const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
   const params = useParams();
@@ -218,7 +219,7 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
           />
         </ModalBody>
         {/* ...(localStorage?.getItem("role") !== "Maker" ? ["Status"] : []), */}
-        {localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER &&<ModalFooter pt={0}>
+        {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) &&<ModalFooter pt={0}>
           <Box display={"flex"} justifyContent={"center"} gap={2}>
             <Button
               rounded={"sm"}
diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
index fc43da9..4b217bf 100644
--- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
@@ -43,6 +43,7 @@ import {
   import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
 import ApprovedExit from "./ApprovedExit";
 import RequestRejectModal from "./RequestRejectModal";
+import { encryptString } from "../../../../Constants/Constants";
   
   const ViewExit = ({ isOpen, onClose ,id:investerId}) => {
     const params = useParams();
@@ -273,7 +274,7 @@ import RequestRejectModal from "./RequestRejectModal";
             />
             {/* ) } */}
           </ModalBody>
-          {localStorage?.getItem("role") !== import.meta.env.VITE_VITE_MAKER && <ModalFooter pt={0}>
+          {localStorage?.getItem("role") !== encryptString(import.meta.env.VITE_VITE_MAKER) && <ModalFooter pt={0}>
             <Box display={"flex"} justifyContent={"center"} gap={2}>
                 <Button
                   rounded={"sm"}
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
index 753bc8f..2f0fa4d 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
@@ -44,6 +44,7 @@ import { GrGallery } from "react-icons/gr";
 import Loader01 from "../../../Components/Loaders/Loader01";
 import { useUpdateTransactionMutation } from "../../../Services/io.service";
 import ToastBox from "../../../Components/ToastBox";
+import { encryptString } from "../../../Constants/Constants";
 // import { formatCurrency } from "../../../Components/CurrencyInput";
 // import { removeTrailingZeros } from "../../../Constants/Constants";
 
@@ -532,7 +533,7 @@ const ViewIOdataHeader = ({ data, isLoading }) => {
         alignItems={"start"}
         height={"95px"}
       >
-        {localStorage?.getItem("role") === import.meta.env.VITE_VITE_MAKER && <Menu>
+        {localStorage?.getItem("role") === encryptString(import.meta.env.VITE_VITE_MAKER) && <Menu>
           <MenuButton 
             className="link p-1 rounded-1 "
             bg={"#fff"}
diff --git a/src/Pages/SubAdmin/SubAdmin.jsx b/src/Pages/SubAdmin/SubAdmin.jsx
index 6a9c6d9..ec77771 100644
--- a/src/Pages/SubAdmin/SubAdmin.jsx
+++ b/src/Pages/SubAdmin/SubAdmin.jsx
@@ -185,20 +185,20 @@ const SubAdmin = () => {
           py={"2px"}
           me={2}
           fontWeight={600}
-          bg={item?.role[0]?.role === import.meta.env.VITE_VITE_MAKER ? "#00ffcc" : "#b3ff99"}
-          px={item?.role[0]?.role === import.meta.env.VITE_VITE_MAKER ? "12px"  : "5px"}
+          bg={item?.role[0]?.role === "Maker" ? "#00ffcc" : "#b3ff99"}
+          px={item?.role[0]?.role === "Maker" ? "12px"  : "5px"}
         >
           {item?.role[0]?.role}
         </Badge>
         <Switch
           onChange={() =>
-            handleToggleStatus(item?.role[0]?.role === import.meta.env.VITE_VITE_MAKER, item?.id)
+            handleToggleStatus(item?.role[0]?.role === "Maker", item?.id)
           }
-          isChecked={item?.role[0]?.role === import.meta.env.VITE_VITE_MAKER}
+          isChecked={item?.role[0]?.role === "Maker"}
           // colorScheme={item?.role[0]?.role === "Maker" ? "green" : "teal"}
           sx={{
             ".chakra-switch__track": {
-              bg: item?.role[0]?.role === import.meta.env.VITE_VITE_MAKER ? "#00ffcc" : "#b3ff99", // "Off" state color
+              bg: item?.role[0]?.role === "Maker" ? "#00ffcc" : "#b3ff99", // "Off" state color
             },
           }}
         />
diff --git a/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx b/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx
index 1360fdd..948e78a 100644
--- a/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx
+++ b/src/Pages/SubAdmin/SubAdminUpdateCreate.jsx
@@ -18,6 +18,7 @@ import {
   useUpdateSubAdminMutation,
 } from "../../Services/subadmin.service";
 import { useGetSponserByIdQuery } from "../../Services/io.service";
+import { encryptString } from "../../Constants/Constants";
 // ======================= [validation] =========================
 
 export const addSubAdmin = yup.object().shape({
@@ -94,7 +95,7 @@ const SubAdminUpdateCreate = () => {
         lastName: subAdminByIdData?.data?.lastName,
         emailAddress: subAdminByIdData?.data?.emailAddress,
       });
-      setIsSwitchOn(subAdminByIdData?.data?.role[0]?.role===import.meta.env.VITE_VITE_MAKER);
+      setIsSwitchOn(subAdminByIdData?.data?.role[0]?.role===encryptString(import.meta.env.VITE_VITE_MAKER));
       console.log(subAdminByIdData?.data?.role);
     }
   }, [subAdminByIdData, reset]);
diff --git a/src/Services/change.password.service.js b/src/Services/change.password.service.js
new file mode 100644
index 0000000..4c8adc3
--- /dev/null
+++ b/src/Services/change.password.service.js
@@ -0,0 +1,33 @@
+
+// Need to use the React-specific entry point to import createApi
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
+import { baseQuery } from "./token.serivce";
+
+
+
+// Define a service using a base URL and expected endpoints
+export const changePasswordMake = createApi({
+  reducerPath: "changePassword",
+  baseQuery: baseQuery,
+  tagTypes: ["getPassword"],
+  endpoints: (builder) => ({
+
+
+    // // ========[ update ]========
+
+    updatePassword: builder.mutation({
+      query: (data) => ({
+        url: `/auth/admin/update-password`,
+        method: "POST",
+        body: data,
+      }),
+      invalidatesTags: ["getPassword"],
+    }),
+
+  }),
+});
+
+// Export hooks for usage in functional components
+export const {
+    useUpdatePasswordMutation
+} = changePasswordMake;
diff --git a/src/Store/Store.js b/src/Store/Store.js
index e2cdb06..42f2add 100644
--- a/src/Store/Store.js
+++ b/src/Store/Store.js
@@ -18,6 +18,7 @@ import { banInvestorDetails } from "../Services/ban.investor.service";
 import { fawateerRequest } from "../Services/fawateer.request.service";
 import { fawateerMaker } from "../Services/fawateer.maker.service";
 import { sabAdminMaster } from "../Services/subadmin.service";
+import { changePasswordMake } from "../Services/change.password.service";
 
 export const store = configureStore({
   reducer: {
@@ -37,6 +38,7 @@ export const store = configureStore({
     [fawateerRequest.reducerPath]: fawateerRequest.reducer,
     [fawateerMaker.reducerPath]: fawateerMaker.reducer,
     [sabAdminMaster.reducerPath]: sabAdminMaster.reducer,
+    [changePasswordMake.reducerPath]: changePasswordMake.reducer,
 
     // Add other reducers as needed
   },
@@ -62,6 +64,7 @@ export const store = configureStore({
       fawateerRequest.middleware,
       fawateerMaker.middleware,
       sabAdminMaster.middleware,
+      changePasswordMake.middleware,
     ),
 });