diff --git a/src/components/Ecosystem/Dashboard.tsx b/src/components/Ecosystem/Dashboard.tsx
index 4fa471c61..80f76bfd8 100644
--- a/src/components/Ecosystem/Dashboard.tsx
+++ b/src/components/Ecosystem/Dashboard.tsx
@@ -18,6 +18,7 @@ import {
 	ICheckEcosystem,
 	checkEcosystem,
 	getEcosystemId,
+	getOwnerAdminRole,
 } from '../../config/ecosystem';
 import { Button, Dropdown } from 'flowbite-react';
 import EditPopupModal from '../EditEcosystemOrgModal';
@@ -198,14 +199,19 @@ const Dashboard = () => {
 	const navigateToInvitation = () => {
 		window.location.href = pathRoutes.ecosystem.sentinvitation;
 	};
+	const [isAccess, setIsAccess] = useState(false);
 
+	const checkEcosystemData = async () => {
+		const data: ICheckEcosystem = await checkEcosystem();
+		setIsEcosystemLead(Boolean(data));
+	};
+	const checkEcosystemAccess = async () => {
+		const data = await getOwnerAdminRole();
+		setIsAccess(data);
+	};
 	useEffect(() => {
 		getDashboardData();
-
-		const checkEcosystemData = async () => {
-			const data: ICheckEcosystem = await checkEcosystem();
-			setIsEcosystemLead(data.isEcosystemLead);
-		};
+		checkEcosystemAccess()
 		checkEcosystemData();
 	}, []);
 
@@ -330,7 +336,8 @@ const Dashboard = () => {
 										<div className="inline-flex items-center ml-auto absolute top-0 right-0">
 											<Button
 												onClick={navigateToInvitation}
-												className='text-base font-medium text-center text-white bg-primary-700 hover:!bg-primary-800 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
+												className={`${isAccess ? "hover:bg-primary-800 dark:hover:text-primary-700 dark:hover:bg-primary-700" : ""} hover:!bg-primary-800 text-base font-medium text-center text-white bg-primary-700 rounded-lg focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:focus:ring-primary-800 mr-3`}
+												disabled={loading || !isAccess}
 											>
 												<svg
 													className="pr-2"
@@ -347,7 +354,7 @@ const Dashboard = () => {
 												</svg>
 												Invitations
 											</Button>
-											{dropdownOpen ? (
+											{dropdownOpen && isAccess ? (
 												<Dropdown
 													label={'test'}
 													renderTrigger={() => (
@@ -373,7 +380,7 @@ const Dashboard = () => {
 												</Dropdown>
 											) : (
 												<svg
-													className="ml-4 w-4 h-4 text-gray-800 cursor-pointer dark:text-white"
+													className="ml-4 w-4 h-4 text-gray-800 dark:text-white cursor-not-allowed"
 													aria-hidden="true"
 													xmlns="http://www.w3.org/2000/svg"
 													fill="currentColor"
diff --git a/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx b/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
index 50f24c3a7..a2234f1dc 100644
--- a/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
+++ b/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
@@ -1,14 +1,19 @@
-import { Button, Modal, Spinner } from 'flowbite-react';
+import { Button, Modal } from 'flowbite-react';
 import { EndorsementStatus, EndorsementType } from '../../../common/enums';
 import {
 	ICheckEcosystem,
 	checkEcosystem,
 	getEcosystemId,
+	getOwnerAdminRole,
 } from '../../../config/ecosystem';
 import EndorsementCard from './EndorsementCard';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { apiStatusCodes, storageKeys } from '../../../config/CommonConstant';
-import { RejectEndorsementRequest, SignEndorsementRequest, SubmitEndorsementRequest } from '../../../api/ecosystem';
+import {
+	RejectEndorsementRequest,
+	SignEndorsementRequest,
+	SubmitEndorsementRequest,
+} from '../../../api/ecosystem';
 import type { AxiosResponse } from 'axios';
 import { AlertComponent } from '../../AlertComponent';
 import { getFromLocalStorage } from '../../../api/Auth';
@@ -25,17 +30,24 @@ const EndorsementPopup = (props: {
 	const [loadingReject, setLoadingReject] = useState<boolean>(false);
 	const [errMsg, setErrMsg] = useState<string | null>(null);
 	const [isEcosystemData, setIsEcosystemData] = useState<ICheckEcosystem>();
+	const [isAccess, setIsAccess] = useState(false);
+
+	const checkEcosystemData = async () => {
+		const data: ICheckEcosystem = await checkEcosystem();
+		setIsEcosystemData(data);
+	};
+	const checkEcosystemAccess = async () => {
+		const data = await getOwnerAdminRole();
+		setIsAccess(data);
+	};
 
 	useEffect(() => {
-		const checkEcosystemData = async () => {
-			const data: ICheckEcosystem = await checkEcosystem();
-			setIsEcosystemData(data);
-		};
 		checkEcosystemData();
+		checkEcosystemAccess();
 	}, [props?.openModal]);
 
 	useEffect(() => {
-		props.setMessage("");
+		props.setMessage('');
 	}, [props.onAlertClose]);
 
 	const SignEndorsement = async (endorsementId: string) => {
@@ -66,6 +78,7 @@ const EndorsementPopup = (props: {
 	const SubmitEndorsement = async (endorsementId: string) => {
 		try {
 			setLoading(true);
+			setLoadingReject(true);
 			const organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
 			const ecoId = await getEcosystemId();
 			const SubmitEndorsementrequest = await SubmitEndorsementRequest(
@@ -84,6 +97,7 @@ const EndorsementPopup = (props: {
 			setLoading(false);
 		} catch (error) {
 			setLoading(false);
+			setLoadingReject(false);
 			console.error('Error while Submit schema:', error);
 		}
 	};
@@ -115,16 +129,29 @@ const EndorsementPopup = (props: {
 
 	return (
 		<Modal
-		className='h-full'
-		 show={props.openModal} onClose={() => {
-			props.closeModal()
-			setErrMsg(null)
-		}} size="xl">
+			className="h-full"
+			show={props.openModal}
+			onClose={() => {
+				props.closeModal();
+				setErrMsg(null);
+			}}
+			size="xl"
+		>
 			<Modal.Header>
 				{isEcosystemData?.isEcosystemLead ? (
-					<div>Requested {props.endorsementData?.type === EndorsementType.credDef ? "Credential Definition" : "Schema" }</div>
+					<div>
+						Requested{' '}
+						{props.endorsementData?.type === EndorsementType.credDef
+							? 'Credential Definition'
+							: 'Schema'}
+					</div>
 				) : (
-					<div>View {props.endorsementData?.type === EndorsementType.credDef ? "Credential Definition" : "Schema"}</div>
+					<div>
+						View{' '}
+						{props.endorsementData?.type === EndorsementType.credDef
+							? 'Credential Definition'
+							: 'Schema'}
+					</div>
 				)}
 			</Modal.Header>
 			<div className="mt-3 mx-3 -mb-3">
@@ -145,23 +172,13 @@ const EndorsementPopup = (props: {
 			<div className="justify-between">
 				<div className="flex justify-end">
 					{isEcosystemData?.isEcosystemLead &&
-						props.endorsementData?.status === EndorsementStatus.requested ? (
+					props.endorsementData?.status === EndorsementStatus.requested ? (
 						<div className="flex gap-3 pt-1 pb-3">
-							<button
+							<Button
 								onClick={() => RejectEndorsement(props.endorsementData.id)}
-								disabled={loadingReject}
-								className="hover:bg-secondary-700  !ring-2 dark:text-white text-primary-700 font-medium rounded-lg text-sm dark:hover:text-primary-700 "
+								disabled={loading || !isAccess || loadingReject}
+								className={`${isAccess ? "hover:bg-secondary-700 hover:!bg-secondary-700 dark:hover:text-primary-700 dark:hover:bg-secondary-700" : ""} h-12 text-base font-medium text-center !ring-2 dark:text-white text-primary-700 rounded-md bg-white sm:w-auto dark:bg-primary-600 dark:focus:ring-primary-800 mr-3`}
 							>
-								<span className='flex items-center rounded-md text-sm px-4 py-2'>
-									{
-										loadingReject &&
-										<Spinner
-											className='mr-2'
-											color={'info'}
-											size={'md'}
-
-										/>
-									}
 									<svg
 										xmlns="http://www.w3.org/2000/svg"
 										width="24"
@@ -179,14 +196,13 @@ const EndorsementPopup = (props: {
 										/>
 									</svg>
 									<span className="ml-2 mr-2">Decline</span>
-								</span>
-							</button>
+							</Button>
 
 							<Button
 								isProcessing={loading}
 								color="bg-primary-800"
-								disabled={loading}
-								className="text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800 mr-3"
+								disabled={loading || !isAccess || loadingReject}
+								className={`${isAccess ? "hover:bg-primary-800 dark:hover:text-primary-700 dark:hover:bg-primary-700" : ""} text-base font-medium text-center text-white bg-primary-700 rounded-lg focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:focus:ring-primary-800 mr-3`}
 								onClick={() => {
 									SignEndorsement(props.endorsementData.id);
 								}}
@@ -204,16 +220,14 @@ const EndorsementPopup = (props: {
 										d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
 									/>
 								</svg>
-								<span className='ml-2 mr-2'>
-									Endorse
-								</span>
+								<span className="ml-2 mr-2">Endorse</span>
 							</Button>
 						</div>
 					) : (
 						<>
 							{!isEcosystemData?.isEcosystemLead &&
-								isEcosystemData?.isEcosystemMember &&
-								props.endorsementData?.status === EndorsementStatus.signed ? (
+							isEcosystemData?.isEcosystemMember &&
+							props.endorsementData?.status === EndorsementStatus.signed ? (
 								<div className="flex gap-3 pt-1 pb-3">
 									<Button
 										isProcessing={loading}
@@ -237,9 +251,7 @@ const EndorsementPopup = (props: {
 												d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
 											/>
 										</svg>
-										<span className='ml-2 mr-2'>
-										Submit
-										</span>
+										<span className="ml-2 mr-2">Submit</span>
 									</Button>
 								</div>
 							) : (
@@ -273,7 +285,7 @@ const EndorsementPopup = (props: {
 					)}
 				</div>
 			</div>
-		</Modal >
+		</Modal>
 	);
 };
 
diff --git a/src/components/EcosystemInvite/SentInvitations.tsx b/src/components/EcosystemInvite/SentInvitations.tsx
index df0098883..ec92721b4 100644
--- a/src/components/EcosystemInvite/SentInvitations.tsx
+++ b/src/components/EcosystemInvite/SentInvitations.tsx
@@ -15,6 +15,8 @@ import RoleViewButton from '../RoleViewButton';
 import SendInvitationModal from '../organization/invitations/SendInvitationModal';
 import { getFromLocalStorage } from '../../api/Auth';
 import { Features } from '../../utils/enums/features';
+import { getOwnerAdminRole } from '../../config/ecosystem';
+import { OrganizationRoles } from '../../common/enums';
 
 const initialPageState = {
 	pageNumber: 1,
@@ -32,7 +34,8 @@ const SentInvitations = () => {
 		useState<Array<Invitation> | null>(null);
 	const [ecosystemId, setEcosystemId] = useState<string>('');
 	const [openModal, setOpenModal] = useState<boolean>(false);
-
+	const [isAccess, setIsAccess] = useState(false);
+	
 	const onPageChange = (page: number) => {
 		setCurrentPage({
 			...currentPage,
@@ -40,6 +43,11 @@ const SentInvitations = () => {
 		});
 	};
 
+	const checkEcosystemAccess = async () => {
+		const data = await getOwnerAdminRole(OrganizationRoles.organizationOwner);
+		setIsAccess(data);
+	};
+
 	const getAllSentInvitations = async () => {
 		const ecosystemId = await getFromLocalStorage(storageKeys.ECOSYSTEM_ID);
 		setEcosystemId(ecosystemId);
@@ -94,6 +102,7 @@ const SentInvitations = () => {
 		} else {
 			getAllSentInvitations();
 		}
+		checkEcosystemAccess();
 		return () => clearTimeout(getData);
 	}, [searchText, currentPage.pageNumber]);
 
@@ -110,7 +119,7 @@ const SentInvitations = () => {
 						</h1>
 						<div className="inline-flex items-center ml-auto">
 							<SendInvitationModal
-							  getAllSentInvitations={getAllSentInvitations}
+								getAllSentInvitations={getAllSentInvitations}
 								flag={true}
 								ecosystemId={ecosystemId}
 								openModal={openModal}
@@ -249,6 +258,7 @@ const SentInvitations = () => {
 																onClick={() => deletInvitations(invitation.id)}
 																color="bg-white"
 																className="ml-5 font-normal items-center mt-5 text-xl text-primary-700 border border-blue-700 text-center hover:!bg-primary-800 hover:text-white rounded-lg focus:ring-4 focus:ring-primary-300 sm:w-auto dark:hover:bg-primary-700 dark:text-white dark:bg-primary-700 dark:focus:ring-blue-800"
+																disabled={!isAccess}
 															>
 																<svg
 																	className="w-6 h-6"
diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
index e00ae32b5..36c6c7660 100644
--- a/src/components/User/UserDashBoard.tsx
+++ b/src/components/User/UserDashBoard.tsx
@@ -27,6 +27,7 @@ import {
 	OrganizationRoles,
 } from '../../common/enums';
 import CustomSpinner from '../CustomSpinner';
+import { getOwnerAdminRole } from '../../config/ecosystem';
 
 const initialPageState = {
 	pageNumber: 1,
@@ -59,6 +60,7 @@ const UserDashBoard = () => {
 	const [currentPage, setCurrentPage] = useState(initialPageState);
 	const [organizationsList, setOrganizationList] =
 		useState<Array<Organisation> | null>(null);
+		
 	const [activityList, setActivityList] = useState<Array<UserActivity> | null>(
 		null,
 	);
@@ -74,7 +76,7 @@ const UserDashBoard = () => {
 		allSearch: '',
 	});
 	const [ecoCount, setEcoCount] = useState(0);
-	const [ecosystemList, setEcosystemList] = useState([]);
+	const [ecosystemList, setEcosystemList] = useState([]);	
 	const [credDefList, setCredDefList] = useState([]);
 	const [credDefCount, setCredDefCount] = useState(0);
 	const [walletData, setWalletData] = useState([]);
@@ -84,6 +86,7 @@ const UserDashBoard = () => {
 	const [orgLoading, setOrgLoading] = useState(true);
 	const [schemaLoading, setSchemaLoading] = useState(true);
 	const [walletLoading, setWalletLoading] = useState(true);
+  const [isAccess, setIsAccess]= useState(false)
 
 	const getAllInvitations = async () => {
 		setLoading(true);
@@ -156,15 +159,13 @@ const UserDashBoard = () => {
 			const orgList = data?.data?.organizations.filter(
 				(userOrg: Organisation, index: number) => index < 3,
 			);
-			setOrganizationList(orgList);
+			setOrganizationList(orgList);			
 		} else {
 			setError(response as string);
 		}
-
 		setOrgLoading(false);
 	};
 
-	//Fetch the user recent activity
 	const getUserRecentActivity = async () => {
 		setLoading(true);
 		const response = await getUserActivity(5);
@@ -307,6 +308,11 @@ const UserDashBoard = () => {
 		}
 		setWalletLoading(false);
 	};
+	
+	const checkEcosystemAccess = async () => {
+		const data = await getOwnerAdminRole();
+		setIsAccess(data);
+	};
 
 	const getAllResponses = async () => {
 		const role = await getFromLocalStorage(storageKeys.ORG_ROLES);
@@ -337,6 +343,7 @@ const UserDashBoard = () => {
 			getSchemaList(schemaListAPIParameter, false);
 			fetchEcosystems();
 			getSchemaCredentials();
+			checkEcosystemAccess()
 		}
 	}, [organizationsList]);
 
@@ -415,7 +422,8 @@ const UserDashBoard = () => {
 		window.location.href = pathRoutes.organizations.credentials;
 	};
 
-	const navigateToInvitation = () => {
+	const navigateToInvitation = async (ecosystemId: string) => {
+		await setToLocalStorage(storageKeys.ECOSYSTEM_ID, ecosystemId);
 		window.location.href = pathRoutes.ecosystem.sentinvitation;
 	};
 
@@ -530,7 +538,7 @@ const UserDashBoard = () => {
 				<></>
 			) : (
 				<div
-					className="p-8 grid w-full grid-cols-1 sm:grid-cols-3 gap-4 mt-0 mb-4 rounded-md border border-gray-200 shadow-sm dark:border-gray-700 dark:bg-gray-800 dark:bg-[url('/images/bg-darkwallet.png')] bg-[url('/images/bg-lightwallet.png')] bg-center bg-no-repeat p-0 bg-auto"
+					className="p-8 grid w-full grid-cols-1 sm:grid-cols-3 gap-4 mt-0 mb-4 rounded-md border border-gray-200 shadow-sm dark:border-gray-700 dark:bg-gray-800 dark:bg-[url('/images/bg-darkwallet.png')] bg-[url('/images/bg-lightwallet.png')] bg-center bg-no-repeat p-0 bg-auto dark:bg-cover"
 					style={{ minHeight: '130px' }}
 				>
 					{walletLoading ? (
@@ -1179,9 +1187,10 @@ const UserDashBoard = () => {
 																?.name === EcosystemRoles.ecosystemLead && (
 																<button
 																	onClick={() => {
-																		navigateToInvitation();
+																		navigateToInvitation(ecosystem?.id);
 																	}}
-																	className="rounded-md flex "
+																	className={`${!isAccess ? "cursor-not-allowed opacity-50":""} rounded-md flex`}
+																	disabled={!isAccess}
 																>
 																	<svg
 																		xmlns="http://www.w3.org/2000/svg"
diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx
index 1a3de17b7..4807ffbb8 100644
--- a/src/components/organization/OrganizationsList.tsx
+++ b/src/components/organization/OrganizationsList.tsx
@@ -14,7 +14,10 @@ import RoleViewButton from '../RoleViewButton';
 import SearchInput from '../SearchInput';
 import { getOrganizations } from '../../api/organization';
 import { pathRoutes } from '../../config/pathRoutes';
-import { setToLocalStorage } from '../../api/Auth';
+import {
+	removeFromLocalStorage,
+	setToLocalStorage,
+} from '../../api/Auth';
 import { EmptyListMessage } from '../EmptyListComponent';
 import CustomSpinner from '../CustomSpinner';
 import CreateEcosystemOrgModal from '../CreateEcosystemOrgModal';
@@ -48,7 +51,6 @@ const OrganizationsList = () => {
 		props.setOpenModal(true);
 	};
 
-	//Fetch the user organization list
 	const getAllOrganizations = async () => {
 		setLoading(true);
 		const response = await getOrganizations(
@@ -80,7 +82,6 @@ const OrganizationsList = () => {
 		setLoading(false);
 	};
 
-	//This useEffect is called when the searchText changes
 	useEffect(() => {
 		let getData: NodeJS.Timeout;
 
@@ -105,12 +106,15 @@ const OrganizationsList = () => {
 		}
 	}, []);
 
-	//onCHnage of Search input text
 	const searchInputChange = (e: ChangeEvent<HTMLInputElement>) => {
 		setSearchText(e.target.value);
 	};
 
 	const redirectOrgDashboard = async (activeOrg: Organisation) => {
+		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ID);
+		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ROLE);
+		await removeFromLocalStorage(storageKeys.ORG_DETAILS);
+
 		await setToLocalStorage(storageKeys.ORG_ID, activeOrg.id.toString());
 		const roles: string[] = activeOrg?.userOrgRoles.map(
 			(role) => role.orgRole.name,
@@ -168,7 +172,8 @@ const OrganizationsList = () => {
 																		key={index}
 																		className="m-1 bg-primary-50 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300"
 																	>
-																		{role.charAt(0).toUpperCase() + role.slice(1)}
+																		{role.charAt(0).toUpperCase() +
+																			role.slice(1)}
 																	</span>
 																);
 															})}
@@ -228,32 +233,37 @@ const OrganizationsList = () => {
 				<BreadCrumbs />
 			</div>
 
-			<div className='mb-4 flex justify-between flex-wrap gap-4 items-center'>
+			<div className="mb-4 flex justify-between flex-wrap gap-4 items-center">
 				<h1 className="ml-1 text-xl font-semibold mb-4 flex justify-between flex-wrap gap-4  text-gray-900 sm:text-2xl dark:text-white">
 					Organizations
 				</h1>
 				<div className="ml-auto">
-					<SearchInput
-						onInputChange={searchInputChange}
-					/>
+					<SearchInput onInputChange={searchInputChange} />
 				</div>
 				<RoleViewButton
-					buttonTitle='Create'
+					buttonTitle="Create"
 					feature={Features.CRETAE_ORG}
 					svgComponent={
-						<div className='pr-3'>
-							<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none" viewBox="0 0 24 24">
-								<path fill="#fff" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z" />
+						<div className="pr-3">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								width="15"
+								height="15"
+								fill="none"
+								viewBox="0 0 24 24"
+							>
+								<path
+									fill="#fff"
+									d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z"
+								/>
 							</svg>
 						</div>
 					}
 					onClickEvent={createOrganizationModel}
 				/>
-
 			</div>
 			<div>
 				<div className="p-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700   sm:p-6 dark:bg-gray-800">
-
 					<CreateEcosystemOrgModal
 						openModal={props.openModal}
 						setMessage={(data) => setMessage(data)}
diff --git a/src/components/organization/invitations/SendInvitationModal.tsx b/src/components/organization/invitations/SendInvitationModal.tsx
index d2fde63e0..cb05119ca 100644
--- a/src/components/organization/invitations/SendInvitationModal.tsx
+++ b/src/components/organization/invitations/SendInvitationModal.tsx
@@ -323,7 +323,7 @@ const SendInvitationModal = (props: {
 					<div className="mt-4 flex justify-end">
 						<Button
 							onClick={props.flag ? sendEcoSystemInvitations : sendInvitations}
-							disabled={invitations.length === 0}
+							disabled={loading || invitations.length === 0}
 							isProcessing={loading}
 							className='text-base font-medium text-center text-white bg-primary-700 hover:!bg-primary-800 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
 						>
diff --git a/src/components/organization/users/EditUserRolesModal.tsx b/src/components/organization/users/EditUserRolesModal.tsx
index f6df63db7..ec1ef0e8f 100644
--- a/src/components/organization/users/EditUserRolesModal.tsx
+++ b/src/components/organization/users/EditUserRolesModal.tsx
@@ -205,6 +205,7 @@ const EditUserRoleModal = (props: { openModal: boolean; user: User; setMessage:
                         onClick={editUserRole}
                         color="bg-primary-800"
                         isProcessing={loading}
+												disabled={loading}
                         className="text-white px-6 py-1 items-center justify-center bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-sm text-center dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
                     ><svg className="pr-2" xmlns="http://www.w3.org/2000/svg" width="25" height="25" fill="none" viewBox="0 0 18 18">
 										<path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 1v12l-4-2-4 2V1h8ZM3 17h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2Z"/>
diff --git a/src/config/ecosystem.ts b/src/config/ecosystem.ts
index b5df99a4a..44603de7d 100644
--- a/src/config/ecosystem.ts
+++ b/src/config/ecosystem.ts
@@ -1,7 +1,7 @@
 import type { AxiosResponse } from 'axios';
 import { getFromLocalStorage, setToLocalStorage } from '../api/Auth';
 import { getEcosystems } from '../api/ecosystem';
-import { EcosystemRoles } from '../common/enums';
+import { EcosystemRoles, OrganizationRoles } from '../common/enums';
 import { apiStatusCodes, storageKeys } from './CommonConstant';
 import { getOrganizationById } from '../api/organization';
 import { Roles } from '../utils/enums/roles';
@@ -52,10 +52,7 @@ const checkEcosystem = async (): Promise<ICheckEcosystem> => {
 	const isEnabledEcosystem = userData?.enableEcosystem;
 	const ecosystemRole = role || EcosystemRoles.ecosystemLead;
 
-	const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
-
 	const isMultiEcosystem = userData?.multiEcosystemSupport;
-	// const isMultiEcosystem = false
 
 	const isLead = ecosystemRole === EcosystemRoles.ecosystemLead && isEnabledEcosystem
 
@@ -78,8 +75,7 @@ const getEcosystemId = async (): Promise<string> => {
 
 				if (
 					data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS &&
-					data?.data && data?.data.ecosystemDetails &&
-					data?.data.ecosystemDetails.length > 0
+					data?.data?.ecosystemDetails?.length > 0
 				) {
 					const response = data?.data.ecosystemDetails[0];
 					const id = response?.id;
@@ -102,10 +98,23 @@ const getEcosystemId = async (): Promise<string> => {
 };
 
 const getUserRoles = async () => {
-	const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
-	const roles = orgRoles.split(',')
-	return roles
-}
+	const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
+	const roles = orgRoles.split(',');
+	return roles;
+};
+
+const getOwnerAdminRole = async (props?: string) => {
+	const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
+	if (props) {
+		const roles = orgRoles.includes(OrganizationRoles.organizationOwner);
+		return roles;
+	} else {
+		const roles =
+			orgRoles.includes(OrganizationRoles.organizationOwner) ||
+			orgRoles.includes(OrganizationRoles.organizationAdmin);
+		return roles;
+	}
+};
 
 const getOrgDetails = async (): Promise<IOrgDetails> => {
 	const orgId = await getOrgId();
@@ -140,4 +149,10 @@ const getOrgDetails = async (): Promise<IOrgDetails> => {
 	return orgData;
 };
 
-export { checkEcosystem, getEcosystemId, getOrgDetails, getUserRoles };
+export {
+	checkEcosystem,
+	getEcosystemId,
+	getOrgDetails,
+	getUserRoles,
+	getOwnerAdminRole,
+};
diff --git a/src/pages/organizations/users.astro b/src/pages/organizations/users.astro
index 6f3498224..a0ce478d2 100644
--- a/src/pages/organizations/users.astro
+++ b/src/pages/organizations/users.astro
@@ -1,6 +1,6 @@
 ---
 import LayoutSidebar from '../../app/LayoutSidebar.astro';
-import Users from '../../components/organization/users/index'
+import UsersTab from '../../components/organization/users/index'
 import { checkUserSession } from '../../utils/check-session';
 import { pathRoutes } from '../../config/pathRoutes';
 
@@ -12,5 +12,5 @@ if (!response.authorized) {
 ---
 
 <LayoutSidebar notFoundPage={!response.permitted}>
-	<Users client:visible/>
+	<UsersTab client:visible/>
 </LayoutSidebar>