diff --git a/client/apps/portal-administration/app.config.ts b/client/apps/portal-administration/app.config.ts
index d2f67cbcf..d3851f709 100644
--- a/client/apps/portal-administration/app.config.ts
+++ b/client/apps/portal-administration/app.config.ts
@@ -1,9 +1,16 @@
 import { defineAppConfig } from '@equinor/fusion-framework-cli';
+
+const feature = true;
 export default defineAppConfig((_env) => ({
 	environment: {
-		client: {
-			baseUri: 'https://backend-fusion-project-portal-test.radix.equinor.com',
-			defaultScopes: ['api://02f3484c-cad0-4d1d-853d-3a9e604b38f3/access_as_user'],
-		},
+		client: feature
+			? {
+					baseUri: 'https://backend-fusion-project-portal-feature.radix.equinor.com',
+					defaultScopes: ['api://7bf96dd1-39fe-47dd-8286-329c730ac76b/access_as_user'],
+			  }
+			: {
+					baseUri: 'https://backend-fusion-project-portal-test.radix.equinor.com',
+					defaultScopes: ['api://02f3484c-cad0-4d1d-853d-3a9e604b38f3/access_as_user'],
+			  },
 	},
 }));
diff --git a/client/apps/portal-administration/package.json b/client/apps/portal-administration/package.json
index ba8392042..26b2bd577 100644
--- a/client/apps/portal-administration/package.json
+++ b/client/apps/portal-administration/package.json
@@ -24,6 +24,7 @@
     "react-router-dom": "^6.26.0",
     "@equinor/fusion-react-side-sheet": "^1.3.3",
     "@equinor/fusion-framework-module-navigation": "^4.0.7",
+    "@equinor/fusion-framework-module-msal": "^3.1.5",
     "@equinor/fusion-framework-react-app": "^5.2.10",
     "@ag-grid-community/core": "^32.1.0",
     "react": "^18.2.0",
@@ -43,4 +44,4 @@
     "uuidv7": "^1.0.1",
     "zod": "^3.23.8"
   }
-}
+}
\ No newline at end of file
diff --git a/client/apps/portal-administration/src/components/FormComponents/AddAdmins.tsx b/client/apps/portal-administration/src/components/FormComponents/AddAdmins.tsx
new file mode 100644
index 000000000..f9a1d50be
--- /dev/null
+++ b/client/apps/portal-administration/src/components/FormComponents/AddAdmins.tsx
@@ -0,0 +1,93 @@
+import { Label, Icon, Button, Typography } from '@equinor/eds-core-react';
+import { PersonSelect, PersonListItem, PersonSelectEvent } from '@equinor/fusion-react-person';
+import { FieldErrors, UseFormSetValue, UseFormWatch } from 'react-hook-form';
+import styled from 'styled-components';
+import { error_filled, close } from '@equinor/eds-icons';
+import { PortalInputs } from '../../schema';
+
+const Style = {
+	AdminError: styled(Typography).withConfig({ displayName: 'AdminError' })`
+		display: flex;
+		gap: 0.5rem;
+		align-items: center;
+	`,
+	AdminList: styled.div`
+		padding-top: 1rem;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		gap: 1rem;
+	`,
+};
+
+export const AddAdmins = ({
+	watch,
+	setValue,
+	errors,
+	canEdit,
+}: {
+	watch: UseFormWatch<PortalInputs>;
+	setValue: UseFormSetValue<PortalInputs>;
+	errors: FieldErrors<PortalInputs>;
+	canEdit?: boolean;
+}) => {
+	const handlePersonSelect = (e: PersonSelectEvent) => {
+		const selected = e.nativeEvent.detail.selected?.azureId;
+		if (!selected) return;
+		const current = watch().admins;
+		const selectedItems = [...current, { azureUniqueId: selected }];
+		setValue('admins', selectedItems, { shouldTouch: true, shouldValidate: true });
+	};
+
+	const handlePersonRemove = (azureUniqueId: string) => {
+		setValue(
+			'admins',
+			watch().admins.filter((a) => a.azureUniqueId !== azureUniqueId),
+			{ shouldTouch: true }
+		);
+	};
+
+	const handleOnBlur = () => {
+		setValue('admins', watch().admins, { shouldTouch: true });
+	};
+
+	return (
+		<>
+			{canEdit && (
+				<div>
+					<Label htmlFor="#person-select" label={'Search for Portal Admins'}></Label>
+					<PersonSelect
+						id="person-select"
+						variant="page-dense"
+						selectedPerson={null}
+						onBlur={handleOnBlur}
+						onSelect={handlePersonSelect}
+						placeholder="Search.."
+					/>
+				</div>
+			)}
+			<Style.AdminList>
+				{errors.admins && (
+					<Style.AdminError variant="caption" color="danger">
+						{errors.admins.message}
+						<Icon data={error_filled} title="Error" />
+					</Style.AdminError>
+				)}
+				{watch().admins.map((person) => (
+					<PersonListItem key={person.azureUniqueId} azureId={person.azureUniqueId}>
+						{canEdit && (
+							<Button
+								variant="ghost_icon"
+								onClick={() => {
+									handlePersonRemove(person.azureUniqueId);
+								}}
+							>
+								<Icon data={close} title={`Remove admin`} />
+							</Button>
+						)}
+					</PersonListItem>
+				))}
+			</Style.AdminList>
+		</>
+	);
+};
diff --git a/client/apps/portal-administration/src/components/FormComponents/DescriptionInput.tsx b/client/apps/portal-administration/src/components/FormComponents/DescriptionInput.tsx
index 9b824127d..0cd63b3ff 100644
--- a/client/apps/portal-administration/src/components/FormComponents/DescriptionInput.tsx
+++ b/client/apps/portal-administration/src/components/FormComponents/DescriptionInput.tsx
@@ -8,9 +8,10 @@ type DescriptionInputProps = {
 	errors: FieldErrors<{
 		description?: string | undefined;
 	}>;
+	canEdit?: boolean;
 };
 
-export const DescriptionInput = ({ register, errors }: DescriptionInputProps) => {
+export const DescriptionInput = ({ register, errors, canEdit }: DescriptionInputProps) => {
 	return (
 		<TextField
 			rows={3}
@@ -22,6 +23,7 @@ export const DescriptionInput = ({ register, errors }: DescriptionInputProps) =>
 			inputIcon={errors.description && <Icon data={error_filled} title="Error" />}
 			label="Description"
 			maxLength={500}
+			readOnly={!canEdit}
 		/>
 	);
 };
diff --git a/client/apps/portal-administration/src/components/FormComponents/IconInput.tsx b/client/apps/portal-administration/src/components/FormComponents/IconInput.tsx
index 4f558e706..74b8368fa 100644
--- a/client/apps/portal-administration/src/components/FormComponents/IconInput.tsx
+++ b/client/apps/portal-administration/src/components/FormComponents/IconInput.tsx
@@ -32,9 +32,10 @@ type IconInputProps = {
 		icon?: string | undefined;
 	}>;
 	icon: string;
+	canEdit?: boolean;
 };
 
-export const IconInput = ({ register, errors, icon }: IconInputProps) => {
+export const IconInput = ({ register, errors, icon, canEdit }: IconInputProps) => {
 	return (
 		<Style.Row>
 			<div>
@@ -54,6 +55,7 @@ export const IconInput = ({ register, errors, icon }: IconInputProps) => {
 			<TextField
 				rows={5}
 				multiline
+				readOnly={!canEdit}
 				{...register('icon')}
 				id="textfield-icon"
 				variant={errors.icon && 'error'}
diff --git a/client/apps/portal-administration/src/components/FormComponents/NameIntput.tsx b/client/apps/portal-administration/src/components/FormComponents/NameIntput.tsx
index 5b00b96a4..ffcb2eca8 100644
--- a/client/apps/portal-administration/src/components/FormComponents/NameIntput.tsx
+++ b/client/apps/portal-administration/src/components/FormComponents/NameIntput.tsx
@@ -8,13 +8,15 @@ type NameInputProps = {
 	errors: FieldErrors<{
 		name?: string | undefined;
 	}>;
+	canEdit?: boolean;
 };
 
-export const NameInput = ({ register, errors }: NameInputProps) => {
+export const NameInput = ({ register, errors, canEdit }: NameInputProps) => {
 	return (
 		<TextField
 			{...register('name')}
 			id="textfield-name"
+			readOnly={!canEdit}
 			variant={errors.name && 'error'}
 			helperText={errors.name?.message}
 			inputIcon={errors.name && <Icon data={error_filled} title="Error" />}
diff --git a/client/apps/portal-administration/src/components/FormComponents/ShortNameInput.tsx b/client/apps/portal-administration/src/components/FormComponents/ShortNameInput.tsx
index f04c672bf..ae6df6c75 100644
--- a/client/apps/portal-administration/src/components/FormComponents/ShortNameInput.tsx
+++ b/client/apps/portal-administration/src/components/FormComponents/ShortNameInput.tsx
@@ -8,13 +8,15 @@ type ShortNameInputProps = {
 	errors: FieldErrors<{
 		shortName?: string | undefined;
 	}>;
+	canEdit?: boolean;
 };
 
-export const ShortNameInput = ({ register, errors }: ShortNameInputProps) => {
+export const ShortNameInput = ({ register, errors, canEdit }: ShortNameInputProps) => {
 	return (
 		<TextField
 			{...register('shortName')}
 			id="textfield-short-name"
+			readOnly={!canEdit}
 			variant={errors.shortName && 'error'}
 			helperText={errors.shortName?.message}
 			inputIcon={errors.shortName && <Icon data={error_filled} title="Error" />}
diff --git a/client/apps/portal-administration/src/components/FormComponents/SubTextInput.tsx b/client/apps/portal-administration/src/components/FormComponents/SubTextInput.tsx
index 0af0bd812..3fe7cb9ff 100644
--- a/client/apps/portal-administration/src/components/FormComponents/SubTextInput.tsx
+++ b/client/apps/portal-administration/src/components/FormComponents/SubTextInput.tsx
@@ -8,13 +8,15 @@ type SubtextInputProps = {
 	errors: FieldErrors<{
 		subtext?: string | undefined;
 	}>;
+	canEdit?: boolean;
 };
 
-export const SubtextInput = ({ register, errors }: SubtextInputProps) => {
+export const SubtextInput = ({ register, errors, canEdit }: SubtextInputProps) => {
 	return (
 		<TextField
 			{...register('subtext')}
 			id="textfield-subtext"
+			readOnly={!canEdit}
 			variant={errors.subtext && 'error'}
 			helperText={errors.subtext?.message}
 			inputIcon={errors.subtext && <Icon data={error_filled} title="Error" />}
diff --git a/client/apps/portal-administration/src/components/Portal/EditPortalForm.tsx b/client/apps/portal-administration/src/components/Portal/EditPortalForm.tsx
index 0a3350142..519b0009d 100644
--- a/client/apps/portal-administration/src/components/Portal/EditPortalForm.tsx
+++ b/client/apps/portal-administration/src/components/Portal/EditPortalForm.tsx
@@ -10,13 +10,15 @@ import { useUpdatePortal } from '../../hooks/use-portal-query';
 import { PortalInputs, portalEditInputSchema } from '../../schema';
 import { ContextType, Portal } from '../../types';
 import { DescriptionInput } from '../FormComponents/DescriptionInput';
-
 import { FormActionBar } from './FormActionBar';
 import { IdInput } from '../FormComponents/IdInput';
 import { NameInput } from '../FormComponents/NameIntput';
 import { ShortNameInput } from '../FormComponents/ShortNameInput';
 import { SubtextInput } from '../FormComponents/SubTextInput';
 import { IconInput } from '../FormComponents/IconInput';
+import { AddAdmins } from '../FormComponents/AddAdmins';
+import { useCurrentAccount } from '@equinor/fusion-framework-react-app/msal';
+import { useAccess } from '../../hooks/use-access';
 
 const Style = {
 	Wrapper: styled.div`
@@ -25,6 +27,7 @@ const Style = {
 		flex-direction: column;
 		padding-bottom: 2rem;
 	`,
+
 	Row: styled.div`
 		gap: 1rem;
 		display: flex;
@@ -70,17 +73,16 @@ export const EditPortalForm = (props: {
 		formState: { errors, isSubmitting, touchedFields },
 		watch,
 		setValue,
-		reset,
 	} = useForm<PortalInputs>({
 		resolver: zodResolver(portalEditInputSchema),
 		defaultValues: {
 			...props.portal,
+			admins: props.portal.admins || [],
 		},
 	});
 
 	const onSubmit: SubmitHandler<PortalInputs> = async (editedPortal) => {
 		await updatePortal(editedPortal);
-		reset();
 	};
 
 	const [type, setType] = useState(contexts && contexts?.length > 0 ? 'context-portal' : 'app-portal');
@@ -98,13 +100,21 @@ export const EditPortalForm = (props: {
 		onDisabled && onDisabled(disabled);
 	}, [disabled, onDisabled]);
 
+	const { data: isAdmin } = useAccess();
+
+	const account = useCurrentAccount();
+	const canEdit = useMemo(
+		() => watch().admins?.some((admin) => admin.azureUniqueId === account?.localAccountId) || isAdmin,
+		[watch().admins, account, isAdmin]
+	);
+
 	return (
 		<Style.Wrapper>
 			<Style.Card>
 				<Style.Heading variant="h5">General</Style.Heading>
 				<Style.From onSubmit={handleSubmit(onSubmit)} id="portal">
 					<IdInput register={register} errors={errors} />
-					<NameInput register={register} errors={errors} />
+					<NameInput register={register} errors={errors} canEdit={canEdit} />
 					<Style.Row>
 						<ShortNameInput register={register} errors={errors} />
 						<SubtextInput register={register} errors={errors} />
@@ -112,6 +122,10 @@ export const EditPortalForm = (props: {
 					<DescriptionInput register={register} errors={errors} />
 				</Style.From>
 			</Style.Card>
+			<Style.Card>
+				<Style.Heading variant="h5">Admins</Style.Heading>
+				<AddAdmins watch={watch} setValue={setValue} errors={errors} canEdit={canEdit} />
+			</Style.Card>
 			<Style.Card>
 				<Typography variant="h5">Icon</Typography>
 				<IconInput register={register} errors={errors} icon={watch().icon} />
@@ -128,12 +142,14 @@ export const EditPortalForm = (props: {
 						value="app-portal"
 						checked={type === 'app-portal'}
 						onChange={onTypeChange}
+						disabled={!canEdit}
 					/>
 					<Radio
 						label="Context Portal"
 						value="context-portal"
 						checked={type === 'context-portal'}
 						onChange={onTypeChange}
+						disabled={!canEdit}
 					/>
 				</Style.Row>
 			</Style.Card>
@@ -144,24 +160,29 @@ export const EditPortalForm = (props: {
 						<Typography variant="h5">Context</Typography>
 					</div>
 
-					<Autocomplete
-						id="textfield-context-types"
-						multiple
-						variant={errors.contextTypes && 'error'}
-						helperText={errors.contextTypes?.message}
-						options={props.contextTypes?.map((ct) => ct.type) || []}
-						selectedOptions={watch().contextTypes}
-						onOptionsChange={({ selectedItems }) => {
-							setValue('contextTypes', selectedItems, { shouldTouch: true });
-						}}
-						itemCompare={(item, compare) => {
-							return item === compare;
-						}}
-						label="Context Types"
-					/>
+					{canEdit ? (
+						<Autocomplete
+							id="textfield-context-types"
+							multiple
+							variant={errors.contextTypes && 'error'}
+							helperText={errors.contextTypes?.message}
+							options={props.contextTypes?.map((ct) => ct.type) || []}
+							selectedOptions={watch().contextTypes}
+							onOptionsChange={({ selectedItems }) => {
+								setValue('contextTypes', selectedItems, { shouldTouch: true });
+							}}
+							itemCompare={(item, compare) => {
+								return item === compare;
+							}}
+							label="Context Types"
+						/>
+					) : (
+						<>{watch().contextTypes?.join(' | ')}</>
+					)}
 				</Style.Card>
 			)}
-			{!props.isSideSheet && (
+
+			{!props.isSideSheet && canEdit && (
 				<Style.Card>
 					<Typography variant="overline">Portal Actions</Typography>
 					<Style.Row>
diff --git a/client/apps/portal-administration/src/components/Portals/CreatePortalForm.tsx b/client/apps/portal-administration/src/components/Portals/CreatePortalForm.tsx
index 35aa13dc3..52985dbd8 100644
--- a/client/apps/portal-administration/src/components/Portals/CreatePortalForm.tsx
+++ b/client/apps/portal-administration/src/components/Portals/CreatePortalForm.tsx
@@ -14,6 +14,10 @@ import { NameInput } from '../FormComponents/NameIntput';
 import { ShortNameInput } from '../FormComponents/ShortNameInput';
 import { SubtextInput } from '../FormComponents/SubTextInput';
 import { IconInput } from '../FormComponents/IconInput';
+import { AddAdmins } from '../FormComponents/AddAdmins';
+import { PageMessage } from '../PageMessage/PageMessage';
+import { useAccess } from '../../hooks/use-access';
+import { Loading } from '../Loading';
 
 const Style = {
 	Wrapper: styled.div`
@@ -42,11 +46,25 @@ const Style = {
 		padding-top: 1rem;
 		padding-bottom: 1rem;
 	`,
+	AdminError: styled(Typography).withConfig({ displayName: 'AdminError' })`
+		display: flex;
+		gap: 0.5rem;
+		align-items: center;
+	`,
+	AdminList: styled.div`
+		padding-top: 1rem;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		gap: 1rem;
+	`,
 };
 
 const ICON = `<svg width=\"50\" height=\"35\" viewBox=\"0 0 50 35\" fill=\"none\">\n\t\t\t\t<path\n\t\t\t\t\td=\"M0 2V23.1776L7.05405 16.1235V7.05405H16.1235L23.1776 0H2C0.895431 0 0 0.89543 0 2Z\"\n\t\t\t\t\ttransform=\"translate(50 17.5) scale(0.92727 1.06779) rotate(135)\"\n\t\t\t\t\tfill=\"url(#paint0_linear)\"\n\t\t\t\t></path>\n\t\t\t\t<path\n\t\t\t\t\td=\"M0 2V23.1776L7.05405 16.1235V7.05405H16.1235L23.1776 0H2C0.895431 0 0 0.89543 0 2Z\"\n\t\t\t\t\ttransform=\"translate(0 17.5) scale(0.92727 1.06779) rotate(-45)\"\n\t\t\t\t\tfill=\"url(#paint1_linear)\"\n\t\t\t\t></path>\n\t\t\t\t<path\n\t\t\t\t\td=\"M9.61965 36.6972L2.60087 29.6784L1.96135 22.3809L8.42623 22.9069L9.61965 36.6972Z\"\n\t\t\t\t\ttransform=\"translate(33.8887 34.9863) scale(0.92727 -1.06779) rotate(45)\"\n\t\t\t\t\tfill=\"#990025\"\n\t\t\t\t></path>\n\t\t\t\t<path\n\t\t\t\t\td=\"M7.05434 7.05434L0 0L1.21096 13.8183L7.68846 14.3818L7.05434 7.05434Z\"\n\t\t\t\t\ttransform=\"translate(33.8887 34.9863) scale(0.92727 -1.06779) rotate(45)\"\n\t\t\t\t\tfill=\"#990025\"\n\t\t\t\t></path>\n\t\t\t\t<path\n\t\t\t\t\td=\"M0 0L2.49398 29.5715L9.61965 36.6972L7.01878 7.01878L0 0Z\"\n\t\t\t\t\ttransform=\"translate(33.8887 0.015625) scale(0.92727 1.06779) rotate(45)\"\n\t\t\t\t\tfill=\"#FF1243\"\n\t\t\t\t></path>\n\t\t\t\t<defs>\n\t\t\t\t\t<linearGradient\n\t\t\t\t\t\tid=\"paint0_linear\"\n\t\t\t\t\t\tx2=\"1\"\n\t\t\t\t\t\tgradientUnits=\"userSpaceOnUse\"\n\t\t\t\t\t\tgradientTransform=\"matrix(-13.5478 9.01983 -12.9578 -13.5478 18.0677 6.77391)\"\n\t\t\t\t\t>\n\t\t\t\t\t\t<stop offset=\"0.508287\" stopColor=\"#DC002E\"></stop>\n\t\t\t\t\t\t<stop offset=\"0.508387\" stopColor=\"#FF1243\"></stop>\n\t\t\t\t\t</linearGradient>\n\t\t\t\t\t<linearGradient\n\t\t\t\t\t\tid=\"paint1_linear\"\n\t\t\t\t\t\tx2=\"1\"\n\t\t\t\t\t\tgradientUnits=\"userSpaceOnUse\"\n\t\t\t\t\t\tgradientTransform=\"matrix(-13.5478 9.01983 -12.9578 -13.5478 18.0677 6.77391)\"\n\t\t\t\t\t>\n\t\t\t\t\t\t<stop offset=\"0.508287\" stopColor=\"#DC002E\"></stop>\n\t\t\t\t\t\t<stop offset=\"0.508387\" stopColor=\"#FF1243\"></stop>\n\t\t\t\t\t</linearGradient>\n\t\t\t\t</defs>\n\t\t\t</svg>`;
 
 export const CreatePortalForm = () => {
+	const { isLoading, data: hasAccess } = useAccess();
+
 	const { mutateAsync: createPortal, reset: resetCreate } = useCreatePortal();
 
 	const {
@@ -61,6 +79,7 @@ export const CreatePortalForm = () => {
 		resolver: zodResolver(portalInputSchema),
 		defaultValues: {
 			contextTypes: [],
+			admins: [],
 			icon: ICON,
 		},
 	});
@@ -83,21 +102,35 @@ export const CreatePortalForm = () => {
 		type === 'app-portal' && setValue('contextTypes', []);
 	}, [type]);
 
+	if (isLoading) return <Loading detail="Checking Access" />;
+
+	if (!hasAccess) {
+		return (
+			<PageMessage type="Warning" title="No Access">
+				<Typography>You do not have access to create portals</Typography>
+			</PageMessage>
+		);
+	}
+
 	return (
 		<Style.Wrapper>
 			<Style.Form onSubmit={handleSubmit(onSubmit)} id="create">
 				<Style.Card>
 					<Typography variant="h5">General</Typography>
-					<NameInput register={register} errors={errors} />
+					<NameInput register={register} errors={errors} canEdit={hasAccess} />
 					<Style.Row>
-						<ShortNameInput register={register} errors={errors} />
-						<SubtextInput register={register} errors={errors} />
+						<ShortNameInput register={register} errors={errors} canEdit={hasAccess} />
+						<SubtextInput register={register} errors={errors} canEdit={hasAccess} />
 					</Style.Row>
-					<DescriptionInput register={register} errors={errors} />
+					<DescriptionInput register={register} errors={errors} canEdit={hasAccess} />
+				</Style.Card>
+				<Style.Card>
+					<Style.Heading variant="h5">Admins</Style.Heading>
+					<AddAdmins watch={watch} setValue={setValue} errors={errors} canEdit={hasAccess} />
 				</Style.Card>
 				<Style.Card>
 					<Typography variant="h5">Icon</Typography>
-					<IconInput register={register} errors={errors} icon={watch().icon} />
+					<IconInput register={register} errors={errors} icon={watch().icon} canEdit={hasAccess} />
 				</Style.Card>
 				<Style.Card>
 					<Typography variant="h5">Portal Type</Typography>
diff --git a/client/apps/portal-administration/src/components/Portals/PortalsHeader.tsx b/client/apps/portal-administration/src/components/Portals/PortalsHeader.tsx
index 8d66a3f38..adff498d9 100644
--- a/client/apps/portal-administration/src/components/Portals/PortalsHeader.tsx
+++ b/client/apps/portal-administration/src/components/Portals/PortalsHeader.tsx
@@ -44,7 +44,9 @@ export const PortalsHeader = () => {
 					)}
 				</Styles.Breadcrumbs>
 				<InfoPopover title={activeTab.title}>
-					<Typography>{activeTab.description}</Typography>
+					<Typography>
+						{typeof activeTab.description === 'string' ? activeTab.description : <activeTab.description />}
+					</Typography>
 				</InfoPopover>
 			</Styles.Row>
 			<Styles.Row>
@@ -52,7 +54,7 @@ export const PortalsHeader = () => {
 				<Tabs activeTab={activeTab.key}>
 					<Tabs.List>
 						{tabs.map((tab) => (
-							<Tabs.Tab title={tab.title} value={tab.key} as={Link} to={tab.route}>
+							<Tabs.Tab title={tab.title} value={tab.key} as={Link} to={tab.route} key={tab.key}>
 								<Tooltip title={tab.title}>
 									<Icon data={tab.icon || add} />
 								</Tooltip>
diff --git a/client/apps/portal-administration/src/pages/EditPortal.tsx b/client/apps/portal-administration/src/pages/EditPortal.tsx
index 62027798c..db3a85d8e 100644
--- a/client/apps/portal-administration/src/pages/EditPortal.tsx
+++ b/client/apps/portal-administration/src/pages/EditPortal.tsx
@@ -30,12 +30,19 @@ export const EditPortal = () => {
 
 	const { data: contextTypes, isLoading: contextTypeLoading } = useGetContextTypes();
 
+	if (!portalId) {
+		return <Message title="No portalId provided" />;
+	}
 	if (portalLoading || contextTypeLoading) {
 		return <Loading detail="Loading Portal Config" />;
 	}
 
-	if (!portalId || !portal || !contextTypes) {
-		return <Message title="No portalId provided" />;
+	if (!contextTypes) {
+		return <Message title="No context types found" />;
+	}
+
+	if (!portal) {
+		return <Message title={`No portal found with id ${portalId}`} />;
 	}
 
 	return (
diff --git a/client/apps/portal-administration/src/schema/index.ts b/client/apps/portal-administration/src/schema/index.ts
index c4c02c2ba..3282e0070 100644
--- a/client/apps/portal-administration/src/schema/index.ts
+++ b/client/apps/portal-administration/src/schema/index.ts
@@ -5,8 +5,12 @@ export const contextTypeSchema = z.object({
 
 export type ContextTypeInputs = z.infer<typeof contextTypeSchema>;
 
+const user = z.object({
+	azureUniqueId: z.string(),
+});
+
 const base = {
-	name: z.string().min(3, 'Short description must contain at least 3 character(s)').max(50),
+	name: z.string().min(3, 'Name must contain at least 3 character(s)').max(50),
 	shortName: z
 		.string()
 		.min(2, 'Short Name must contain at least 2 character(s)')
@@ -17,6 +21,7 @@ const base = {
 		.max(150, 'Short Name can contain at most 300 character(s)'),
 	description: z.string().max(500, 'Description can contain at most 300 character(s)').optional(),
 	icon: z.string().default(''),
+	admins: z.array(user).min(1, 'At least one admin is required'),
 };
 
 export const portalInputSchema = z.object({
diff --git a/client/apps/portal-administration/src/types/index.ts b/client/apps/portal-administration/src/types/index.ts
index d5cb295a6..d42fa27e5 100644
--- a/client/apps/portal-administration/src/types/index.ts
+++ b/client/apps/portal-administration/src/types/index.ts
@@ -5,6 +5,12 @@ export type AppManifest = FusionAppManifest & {
 	isDisabled?: boolean;
 	url?: string;
 };
+
+export type Admin = {
+	id?: string;
+	azureUniqueId: string;
+};
+
 export type Portal = {
 	name: string;
 	shortName: string;
@@ -14,6 +20,7 @@ export type Portal = {
 	type: string;
 	icon?: string;
 	description: string;
+	admins: Admin[];
 	contexts: ContextType[];
 };
 
diff --git a/client/apps/portal-administration/src/utils/error-utils.ts b/client/apps/portal-administration/src/utils/error-utils.ts
index aa9a741c3..25d4d414b 100644
--- a/client/apps/portal-administration/src/utils/error-utils.ts
+++ b/client/apps/portal-administration/src/utils/error-utils.ts
@@ -1,11 +1,39 @@
-import { FormattedError } from "../types";
+import { FormattedError } from '../types';
 
 export const DEFAULT_ERROR: FormattedError = {
-  type: "Error",
-  title: "Generic Error",
-  status: -1,
+	type: 'Error',
+	title: 'Generic Error',
+	status: -1,
 };
 
 export const formatError = (errorResponse: unknown, status: number) => {
-  return DEFAULT_ERROR;
+	if (typeof errorResponse === 'string') {
+		return {
+			...DEFAULT_ERROR,
+			title: errorResponse,
+			status,
+		};
+	}
+
+	if (errorResponse instanceof TypeError) {
+		const { cause, name, message, stack } = errorResponse;
+		return {
+			type: 'Error',
+			title: name || 'Generic Error',
+			messages: [message],
+			status: cause,
+			stack,
+		};
+	}
+
+	if (typeof errorResponse === 'object' && errorResponse !== null) {
+		const { title, messages } = errorResponse as FormattedError;
+		return {
+			type: 'Error',
+			title: title || 'Generic Error',
+			messages: messages || [],
+			status,
+		};
+	}
+	return DEFAULT_ERROR;
 };