diff --git a/.gitignore b/.gitignore
index cb934cd76..500cd6776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ dist
 client
 apps/api/db/*.db
 local-serve
-apps/api/db/migration.db-journal
\ No newline at end of file
+apps/api/db/migration.db-journal
+apps/api/core*
\ No newline at end of file
diff --git a/apps/api/src/routes/api/v1/iam/handlers.ts b/apps/api/src/routes/api/v1/iam/handlers.ts
index 72d648793..29740d9cf 100644
--- a/apps/api/src/routes/api/v1/iam/handlers.ts
+++ b/apps/api/src/routes/api/v1/iam/handlers.ts
@@ -158,8 +158,10 @@ export async function getTeam(request: FastifyRequest<OnlyId>, reply: FastifyRep
         });
         const team = await prisma.team.findUnique({ where: { id }, include: { permissions: true } });
         const invitations = await prisma.teamInvitation.findMany({ where: { teamId: team.id } });
+        const { teams } = await prisma.user.findUnique({ where: { id: userId }, include: { teams: true } })
         return {
             team,
+            teams,
             permissions,
             invitations
         };
@@ -275,10 +277,10 @@ export async function inviteToTeam(request: FastifyRequest<InviteToTeam>, reply:
         if (!userFound) {
             throw {
                 message: `No user found with '${email}' email address.`
-            };         
+            };
         }
         const uid = userFound.id;
-        if (uid === userId) {          
+        if (uid === userId) {
             throw {
                 message: `Invitation to yourself? Whaaaaat?`
             };
diff --git a/apps/ui/src/routes/iam/team/[id]/__layout.svelte b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
index ff308d5db..8623b66f5 100644
--- a/apps/ui/src/routes/iam/team/[id]/__layout.svelte
+++ b/apps/ui/src/routes/iam/team/[id]/__layout.svelte
@@ -25,18 +25,33 @@
 </script>
 
 <script lang="ts">
+	export let teams: any;
 	import { page } from '$app/stores';
 	import { errorNotification, handlerNotFoundLoad } from '$lib/common';
 	import { appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { goto } from '$app/navigation';
+	import Cookies from 'js-cookie';
 	const { id } = $page.params;
+
 	async function deleteTeam() {
 		const sure = confirm('Are you sure you want to delete this team?');
 		if (sure) {
 			try {
 				await del(`/iam/team/${id}`, { id });
+				const switchTeam = teams.find((team: any) => team.id !== id)
+				const payload = await get(`/user?teamId=${switchTeam.id}`);
+				if (payload.token) {
+					Cookies.set('token', payload.token, {
+						path: '/'
+					});
+					$appSession.teamId = payload.teamId;
+					$appSession.userId = payload.userId;
+					$appSession.permission = payload.permission;
+					$appSession.isAdmin = payload.isAdmin;
+					return window.location.assign('/iam');
+				}
 				return await goto('/iam', { replaceState: true });
 			} catch (error) {
 				return errorNotification(error);