diff --git a/src/dashboards/Corporate.tsx b/src/dashboards/Corporate.tsx
index 2e9dfaa1..4b2c3f29 100644
--- a/src/dashboards/Corporate.tsx
+++ b/src/dashboards/Corporate.tsx
@@ -15,6 +15,7 @@ import {
 	BsGlobeCentralSouthAsia,
 	BsPaperclip,
 	BsPerson,
+	BsPersonAdd,
 	BsPersonFill,
 	BsPersonFillGear,
 	BsPersonGear,
@@ -27,6 +28,7 @@ import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import {Module} from "@/interfaces";
 import {groupByExam} from "@/utils/stats";
 import IconCard from "./IconCard";
+import GroupList from "@/pages/(admin)/Lists/GroupList";
 
 interface Props {
 	user: User;
@@ -116,6 +118,26 @@ export default function CorporateDashboard({user}: Props) {
 		);
 	};
 
+	const GroupsList = () => {
+		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
+				</div>
+
+				<GroupList user={user} />
+			</>
+		);
+	};
+
 	const averageLevelCalculator = (studentStats: Stat[]) => {
 		const formattedStats = studentStats
 			.map((s) => ({focus: users.find((u) => u.id === s.user)?.focus, score: s.score, module: s.module}))
@@ -132,8 +154,8 @@ export default function CorporateDashboard({user}: Props) {
 	};
 
 	const DefaultDashboard = () => (
-		<div className="flex -xl:flex-col gap-4">
-			<section className="flex -lg:flex-wrap xl:flex-col gap-4 items-center -lg:justify-center lg:justify-between text-center">
+		<>
+			<section className="flex flex-wrap gap-2 items-center -lg:justify-center lg:justify-between text-center">
 				<IconCard
 					onClick={() => setPage("students")}
 					Icon={BsPersonFill}
@@ -160,6 +182,7 @@ export default function CorporateDashboard({user}: Props) {
 					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
 					color="purple"
 				/>
+				<IconCard onClick={() => setPage("groups")} Icon={BsPersonAdd} label="Groups" value={groups.length} color="purple" />
 				<IconCard
 					Icon={BsClock}
 					label="Expiration Date"
@@ -217,7 +240,7 @@ export default function CorporateDashboard({user}: Props) {
 					</div>
 				</div>
 			</section>
-		</div>
+		</>
 	);
 
 	return (
@@ -243,6 +266,7 @@ export default function CorporateDashboard({user}: Props) {
 			</Modal>
 			{page === "students" && <StudentsList />}
 			{page === "teachers" && <TeachersList />}
+			{page === "groups" && <GroupsList />}
 			{page === "" && <DefaultDashboard />}
 		</>
 	);
diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx
index 742605a8..06e485dd 100644
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -91,7 +91,7 @@ export default function TeacherDashboard({user}: Props) {
 	};
 
 	const GroupsList = () => {
-		const filter = (x: Group) => x.admin === user.id;
+		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
 
 		return (
 			<>
@@ -126,7 +126,7 @@ export default function TeacherDashboard({user}: Props) {
 	};
 
 	const DefaultDashboard = () => (
-		<div className="flex flex-col gap-4">
+		<>
 			<section className="flex -lg:flex-wrap gap-4 items-center -lg:justify-center lg:justify-start text-center">
 				<IconCard
 					onClick={() => setPage("students")}
@@ -188,7 +188,7 @@ export default function TeacherDashboard({user}: Props) {
 					</div>
 				</div>
 			</section>
-		</div>
+		</>
 	);
 
 	return (
diff --git a/src/hooks/useGroups.tsx b/src/hooks/useGroups.tsx
index d0d5187f..8d3bbc9d 100644
--- a/src/hooks/useGroups.tsx
+++ b/src/hooks/useGroups.tsx
@@ -10,8 +10,13 @@ export default function useGroups(admin?: string) {
 	const getData = () => {
 		setIsLoading(true);
 		axios
-			.get<Group[]>(!admin ? "/api/groups" : `/api/groups?admin=${admin}`)
-			.then((response) => setGroups(response.data))
+			.get<Group[]>("/api/groups")
+			.then((response) => {
+				const filter = (g: Group) => g.admin === admin || g.participants.includes(admin || "");
+
+				const filteredGroups = admin ? response.data.filter(filter) : response.data;
+				return setGroups(admin ? filteredGroups.map((g) => ({...g, disableEditing: g.disableEditing || g.admin !== admin})) : filteredGroups);
+			})
 			.finally(() => setIsLoading(false));
 	};
 
diff --git a/src/pages/(admin)/Lists/GroupList.tsx b/src/pages/(admin)/Lists/GroupList.tsx
index 114eea53..d59f9bbb 100644
--- a/src/pages/(admin)/Lists/GroupList.tsx
+++ b/src/pages/(admin)/Lists/GroupList.tsx
@@ -122,13 +122,15 @@ const CreatePanel = ({user, users, group, onCreate}: CreateDialogProps) => {
 	);
 };
 
+const filterTypes = ["corporate", "teacher"];
+
 export default function GroupList({user}: {user: User}) {
 	const [editingID, setEditingID] = useState<string>();
 	const [showDisclosure, setShowDisclosure] = useState(false);
 	const [filterByUser, setFilterByUser] = useState(false);
 
 	const {users} = useUsers();
-	const {groups, reload} = useGroups(filterByUser ? user.id : undefined);
+	const {groups, reload} = useGroups(user && filterTypes.includes(user?.type) ? user.id : undefined);
 
 	useEffect(() => {
 		if (editingID) setShowDisclosure(true);
@@ -214,7 +216,7 @@ export default function GroupList({user}: {user: User}) {
 			cell: ({row}: {row: {original: Group}}) => {
 				return (
 					<>
-						{(user.type === "developer" || user.type === "owner" || user.id === row.original.admin) && (
+						{(user?.type === "developer" || user?.type === "owner" || user.id === row.original.admin) && (
 							<div className="flex gap-2">
 								{editingID !== row.original.id && (
 									<div data-tip="Edit" className="cursor-pointer tooltip" onClick={() => setEditingID(row.original.id)}>
@@ -290,13 +292,17 @@ export default function GroupList({user}: {user: User}) {
 						<CreatePanel
 							group={editingID ? groups.find((x) => x.id === editingID) : undefined}
 							user={user}
-							users={users.filter(
-								(u) =>
-									groups
-										.filter((g) => g.admin === user.id)
-										.flatMap((g) => g.participants)
-										.includes(u.id) || groups.flatMap((g) => g.participants).includes(u.id),
-							)}
+							users={
+								user?.type === "corporate" || user?.type === "teacher"
+									? users.filter(
+											(u) =>
+												groups
+													.filter((g) => g.admin === user.id)
+													.flatMap((g) => g.participants)
+													.includes(u.id) || groups.flatMap((g) => g.participants).includes(u.id),
+									  )
+									: users
+							}
 							onCreate={(group) => {
 								(!editingID ? createGroup : updateGroup)(group).then((result) => {
 									if (result) {