diff --git a/packages/react-ui/src/app/components/dashboard-container.tsx b/packages/react-ui/src/app/components/dashboard-container.tsx
index 1cf3574e3ed..94b3faf6c08 100644
--- a/packages/react-ui/src/app/components/dashboard-container.tsx
+++ b/packages/react-ui/src/app/components/dashboard-container.tsx
@@ -1,10 +1,13 @@
 import { t } from 'i18next';
 import { AlertCircle, Link2, Logs, Workflow, Wrench } from 'lucide-react';
+import { Navigate } from 'react-router-dom';
 
 import { useEmbedding } from '@/components/embed-provider';
 import { issueHooks } from '@/features/issues/hooks/issue-hooks';
-import { flagsHooks } from '@/hooks/flags-hooks';
-import { ApEdition, ApFlagId } from '@activepieces/shared';
+import { platformHooks } from '@/hooks/platform-hooks';
+import { isNil } from '@activepieces/shared';
+
+import { authenticationSession } from '../../lib/authentication-session';
 
 import { AllowOnlyLoggedInUserOnlyGuard } from './allow-logged-in-user-only-guard';
 import { Sidebar, SidebarLink } from './sidebar';
@@ -14,11 +17,16 @@ type DashboardContainerProps = {
 };
 
 export function DashboardContainer({ children }: DashboardContainerProps) {
-  const { data: edition } = flagsHooks.useFlag<ApEdition>(ApFlagId.EDITION);
-  const { data: showIssuesNotification } =
-    issueHooks.useIssuesNotification(edition);
+  const { platform } = platformHooks.useCurrentPlatform();
+  const { data: showIssuesNotification } = issueHooks.useIssuesNotification(
+    platform.flowIssuesEnabled,
+  );
 
   const { embedState } = useEmbedding();
+  const currentProjectId = authenticationSession.getProjectId();
+  if (isNil(currentProjectId) || currentProjectId === '') {
+    return <Navigate to="/sign-in" replace />;
+  }
   const links: SidebarLink[] = [
     {
       to: '/flows',
@@ -51,7 +59,14 @@ export function DashboardContainer({ children }: DashboardContainerProps) {
       icon: Wrench,
       showInEmbed: false,
     },
-  ].filter((link) => !embedState.isEmbedded || link.showInEmbed);
+  ]
+    .filter((link) => !embedState.isEmbedded || link.showInEmbed)
+    .map((link) => {
+      return {
+        ...link,
+        to: `/projects/${currentProjectId}${link.to}`,
+      };
+    });
 
   return (
     <AllowOnlyLoggedInUserOnlyGuard>
diff --git a/packages/react-ui/src/app/components/project-settings-layout.tsx b/packages/react-ui/src/app/components/project-settings-layout.tsx
index 3d32cd54302..eb788997835 100644
--- a/packages/react-ui/src/app/components/project-settings-layout.tsx
+++ b/packages/react-ui/src/app/components/project-settings-layout.tsx
@@ -7,9 +7,13 @@ import {
   SunMoon,
   Users,
 } from 'lucide-react';
+import { Navigate } from 'react-router-dom';
 
-import SidebarLayout from '@/app/components/sidebar-layout';
+import SidebarLayout, { SidebarItem } from '@/app/components/sidebar-layout';
 import { platformHooks } from '@/hooks/platform-hooks';
+import { isNil } from '@activepieces/shared';
+
+import { authenticationSession } from '../../lib/authentication-session';
 
 const iconSize = 20;
 
@@ -49,15 +53,26 @@ const sidebarNavItems = [
 interface SettingsLayoutProps {
   children: React.ReactNode;
 }
+
 export default function ProjectSettingsLayout({
   children,
 }: SettingsLayoutProps) {
   const { platform } = platformHooks.useCurrentPlatform();
+  const currentProjectId = authenticationSession.getProjectId();
+  if (isNil(currentProjectId)) {
+    return <Navigate to="/sign-in" replace />;
+  }
+
+  const filterAlerts = (item: SidebarItem) =>
+    platform.alertsEnabled || item.title !== t('Alerts');
+  const addProjectIdToHref = (item: SidebarItem) => ({
+    ...item,
+    href: `/projects/${currentProjectId}${item.href}`,
+  });
 
-  // TODO enable alerts for communityh when it is ready
-  const filteredNavItems = platform.alertsEnabled
-    ? sidebarNavItems
-    : sidebarNavItems.filter((item) => item.title !== t('Alerts'));
+  const filteredNavItems = sidebarNavItems
+    .filter(filterAlerts)
+    .map(addProjectIdToHref);
 
   return (
     <SidebarLayout title={t('Settings')} items={filteredNavItems}>
diff --git a/packages/react-ui/src/app/components/sidebar-layout.tsx b/packages/react-ui/src/app/components/sidebar-layout.tsx
index c3d00c455bb..10a97796460 100644
--- a/packages/react-ui/src/app/components/sidebar-layout.tsx
+++ b/packages/react-ui/src/app/components/sidebar-layout.tsx
@@ -10,7 +10,7 @@ interface SidebarLayoutProps {
   children: React.ReactNode;
 }
 
-type SidebarItem = {
+export type SidebarItem = {
   title: string;
   href: string;
   icon: JSX.Element;
diff --git a/packages/react-ui/src/app/router.tsx b/packages/react-ui/src/app/router/index.tsx
similarity index 84%
rename from packages/react-ui/src/app/router.tsx
rename to packages/react-ui/src/app/router/index.tsx
index df3cbe1b4d8..58017c39710 100644
--- a/packages/react-ui/src/app/router.tsx
+++ b/packages/react-ui/src/app/router/index.tsx
@@ -30,32 +30,33 @@ import {
   ActivepiecesVendorRouteChanged,
 } from 'ee-embed-sdk';
 
-import { FlowsPage } from '../app/routes/flows';
+import { AllowOnlyLoggedInUserOnlyGuard } from '../components/allow-logged-in-user-only-guard';
+import { DashboardContainer } from '../components/dashboard-container';
+import { PlatformAdminContainer } from '../components/platform-admin-container';
+import NotFoundPage from '../routes/404-page';
+import { ChangePasswordPage } from '../routes/change-password';
+import AppConnectionsPage from '../routes/connections';
+import { FlowsPage } from '../routes/flows';
+import { FlowBuilderPage } from '../routes/flows/id';
+import { ResetPasswordPage } from '../routes/forget-password';
+import { FormPage } from '../routes/forms';
+import IssuesPage from '../routes/issues';
+import PlansPage from '../routes/plans';
+import AuditLogsPage from '../routes/platform/audit-logs';
+import ProjectsPage from '../routes/platform/projects';
+import TemplatesPage from '../routes/platform/templates';
+import UsersPage from '../routes/platform/users';
+import { FlowRunPage } from '../routes/runs/id';
+import AlertsPage from '../routes/settings/alerts';
+import AppearancePage from '../routes/settings/appearance';
+import GeneralPage from '../routes/settings/general';
+import { GitSyncPage } from '../routes/settings/git-sync';
+import TeamPage from '../routes/settings/team';
+import { SignInPage } from '../routes/sign-in';
+import { SignUpPage } from '../routes/sign-up';
+import { ShareTemplatePage } from '../routes/templates/share-template';
 
-import { AllowOnlyLoggedInUserOnlyGuard } from './components/allow-logged-in-user-only-guard';
-import { DashboardContainer } from './components/dashboard-container';
-import { PlatformAdminContainer } from './components/platform-admin-container';
-import NotFoundPage from './routes/404-page';
-import { ChangePasswordPage } from './routes/change-password';
-import AppConnectionsPage from './routes/connections';
-import { FlowBuilderPage } from './routes/flows/id';
-import { ResetPasswordPage } from './routes/forget-password';
-import { FormPage } from './routes/forms';
-import IssuesPage from './routes/issues';
-import PlansPage from './routes/plans';
-import AuditLogsPage from './routes/platform/audit-logs';
-import ProjectsPage from './routes/platform/projects';
-import TemplatesPage from './routes/platform/templates';
-import UsersPage from './routes/platform/users';
-import { FlowRunPage } from './routes/runs/id';
-import AlertsPage from './routes/settings/alerts';
-import AppearancePage from './routes/settings/appearance';
-import GeneralPage from './routes/settings/general';
-import { GitSyncPage } from './routes/settings/git-sync';
-import TeamPage from './routes/settings/team';
-import { SignInPage } from './routes/sign-in';
-import { SignUpPage } from './routes/sign-up';
-import { ShareTemplatePage } from './routes/templates/share-template';
+import { ProjectRouterWrapper } from './project-route-wrapper';
 
 const SettingsRerouter = () => {
   const { hash } = useLocation();
@@ -66,6 +67,7 @@ const SettingsRerouter = () => {
     <Navigate to="/settings/general" replace />
   );
 };
+
 const routes = [
   {
     path: '/embed',
@@ -76,7 +78,7 @@ const routes = [
     path: '/switch-to-beta',
     element: <SwitchToBetaPage />,
   },
-  {
+  ...ProjectRouterWrapper({
     path: '/flows',
     element: (
       <DashboardContainer>
@@ -85,8 +87,8 @@ const routes = [
         </PageTitle>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/flows/:flowId',
     element: (
       <AllowOnlyLoggedInUserOnlyGuard>
@@ -95,7 +97,7 @@ const routes = [
         </PageTitle>
       </AllowOnlyLoggedInUserOnlyGuard>
     ),
-  },
+  }),
   {
     path: '/forms/:flowId',
     element: (
@@ -104,7 +106,7 @@ const routes = [
       </PageTitle>
     ),
   },
-  {
+  ...ProjectRouterWrapper({
     path: '/runs/:runId',
     element: (
       <AllowOnlyLoggedInUserOnlyGuard>
@@ -113,7 +115,7 @@ const routes = [
         </PageTitle>
       </AllowOnlyLoggedInUserOnlyGuard>
     ),
-  },
+  }),
   {
     path: '/templates/:templateId',
     element: (
@@ -124,7 +126,7 @@ const routes = [
       </AllowOnlyLoggedInUserOnlyGuard>
     ),
   },
-  {
+  ...ProjectRouterWrapper({
     path: '/runs',
     element: (
       <DashboardContainer>
@@ -133,8 +135,8 @@ const routes = [
         </PageTitle>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/issues',
     element: (
       <DashboardContainer>
@@ -143,8 +145,8 @@ const routes = [
         </PageTitle>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/connections',
     element: (
       <DashboardContainer>
@@ -153,8 +155,8 @@ const routes = [
         </PageTitle>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/plans',
     element: (
       <DashboardContainer>
@@ -163,15 +165,15 @@ const routes = [
         </PageTitle>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/settings',
     element: (
       <DashboardContainer>
         <SettingsRerouter></SettingsRerouter>
       </DashboardContainer>
     ),
-  },
+  }),
   {
     path: '/forget-password',
     element: (
@@ -212,7 +214,7 @@ const routes = [
       </PageTitle>
     ),
   },
-  {
+  ...ProjectRouterWrapper({
     path: '/settings/alerts',
     element: (
       <DashboardContainer>
@@ -223,8 +225,8 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/settings/appearance',
     element: (
       <DashboardContainer>
@@ -235,8 +237,8 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/settings/general',
     element: (
       <DashboardContainer>
@@ -247,8 +249,8 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/settings/pieces',
     element: (
       <DashboardContainer>
@@ -259,9 +261,8 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
-
-  {
+  }),
+  ...ProjectRouterWrapper({
     path: '/settings/team',
     element: (
       <DashboardContainer>
@@ -272,12 +273,13 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
+  }),
   {
     path: '/team',
     element: <Navigate to="/settings/team" replace></Navigate>,
   },
-  {
+
+  ...ProjectRouterWrapper({
     path: '/settings/git-sync',
     element: (
       <DashboardContainer>
@@ -288,7 +290,7 @@ const routes = [
         </ProjectSettingsLayout>
       </DashboardContainer>
     ),
-  },
+  }),
 
   {
     path: '/invitation',
diff --git a/packages/react-ui/src/app/router/project-route-wrapper.tsx b/packages/react-ui/src/app/router/project-route-wrapper.tsx
new file mode 100644
index 00000000000..6fb7dcd44b5
--- /dev/null
+++ b/packages/react-ui/src/app/router/project-route-wrapper.tsx
@@ -0,0 +1,103 @@
+import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
+import React from 'react';
+import { useParams, Navigate } from 'react-router-dom';
+
+import { useEmbedding } from '@/components/embed-provider';
+import { isNil } from '@activepieces/shared';
+
+import { authenticationSession } from '../../lib/authentication-session';
+import { api } from '@/lib/api';
+import { useToast } from '@/components/ui/use-toast';
+import { t } from 'i18next';
+
+const TokenCheckerWrapper: React.FC<{ children: React.ReactNode }> = ({
+    children,
+}) => {
+    const { projectId } = useParams<{ projectId: string }>();
+    const currentProjectId = authenticationSession.getProjectId();
+    const { toast } = useToast();
+    const { data: isProjectValid, isError } = useSuspenseQuery<boolean, Error>({
+        queryKey: ['switch-to-project', projectId],
+        queryFn: async () => {
+            if (isNil(projectId)) {
+                return false;
+            }
+            try {
+                await authenticationSession.switchToSession(projectId!);
+                return true;
+            } catch (error) {
+                if (api.isError(error)) {
+                    toast({
+                        duration: 3000,
+                        title: t('Invalid Access'),
+                        description: t('Either the project does not exist or you do not have access to it.'),
+                    });
+                    authenticationSession.clearSession();
+                }
+                return false;
+            }
+        },
+        retry: false,
+        staleTime: Infinity,
+    });
+
+    if (isNil(currentProjectId) || isNil(projectId)) {
+        return <Navigate to="/sign-in" replace />;
+    }
+
+    if (isError || !isProjectValid) {
+        return <Navigate to="/404" replace />;
+    }
+
+    return <>{children}</>;
+};
+
+type RedirectToCurrentProjectRouteProps = {
+    path: string;
+    children: React.ReactNode;
+};
+const RedirectToCurrentProjectRoute: React.FC<
+    RedirectToCurrentProjectRouteProps
+> = ({ path, children }) => {
+    const currentProjectId = authenticationSession.getProjectId();
+    const params = useParams();
+    const { embedState } = useEmbedding();
+    if (isNil(currentProjectId)) {
+        return <Navigate to="/sign-in" replace />;
+    }
+    if (embedState.isEmbedded) {
+        return children;
+    }
+
+    const pathWithParams = `${path.startsWith('/') ? path : `/${path}`}`.replace(
+        /:(\w+)/g,
+        (_, param) => params[param] ?? '',
+    );
+
+    return (
+        <Navigate to={`/projects/${currentProjectId}${pathWithParams}`} replace />
+    );
+};
+
+interface ProjectRouterWrapperProps {
+    path: string;
+    element: React.ReactNode;
+}
+
+export const ProjectRouterWrapper = ({
+    element,
+    path,
+}: ProjectRouterWrapperProps) => [
+        {
+            path: `/projects/:projectId${path.startsWith('/') ? path : `/${path}`}`,
+            element: <TokenCheckerWrapper>{element}</TokenCheckerWrapper>,
+        },
+        {
+            path,
+            element: (
+                <RedirectToCurrentProjectRoute path={path}>
+                    {element}
+                </RedirectToCurrentProjectRoute>
+            ),
+        },
+    ];
diff --git a/packages/react-ui/src/app/routes/platform/projects/index.tsx b/packages/react-ui/src/app/routes/platform/projects/index.tsx
index 641f783ea4a..7d9c51398b8 100644
--- a/packages/react-ui/src/app/routes/platform/projects/index.tsx
+++ b/packages/react-ui/src/app/routes/platform/projects/index.tsx
@@ -87,7 +87,7 @@ export default function ProjectsPage() {
         </div>
         <DataTable
           onRowClick={async (project) => {
-            await setCurrentProject(queryClient, project, false);
+            await setCurrentProject(queryClient, project);
             navigate('/');
           }}
           columns={[
@@ -177,7 +177,7 @@ export default function ProjectsPage() {
                         onClick={async (e) => {
                           e.stopPropagation();
                           e.preventDefault();
-                          await setCurrentProject(queryClient, row, false);
+                          await setCurrentProject(queryClient, row);
                           navigate('/settings/general');
                         }}
                       >
diff --git a/packages/react-ui/src/components/custom/circular-progress.tsx b/packages/react-ui/src/components/custom/circular-progress.tsx
index d3897a2ce4d..796cb9bf369 100644
--- a/packages/react-ui/src/components/custom/circular-progress.tsx
+++ b/packages/react-ui/src/components/custom/circular-progress.tsx
@@ -21,7 +21,7 @@ const ProgressCircularComponent: React.FC<{
           data={[
             {
               name: 'plan',
-              progress: 0,
+              progress: data.usage,
               fill: 'hsl(var(--primary))',
             },
           ]}
diff --git a/packages/react-ui/src/components/ui/report-bugs-button.tsx b/packages/react-ui/src/components/ui/report-bugs-button.tsx
index 91a7f9fceeb..d490e756a74 100644
--- a/packages/react-ui/src/components/ui/report-bugs-button.tsx
+++ b/packages/react-ui/src/components/ui/report-bugs-button.tsx
@@ -17,7 +17,7 @@ export const ReportBugsButton = ({
   return (
     showSupport && (
       <Button
-        size={'sm'}
+        size="sm"
         variant={variant}
         onClick={() =>
           window.open(reportBugsUrl, '_blank', 'noopener noreferrer')
diff --git a/packages/react-ui/src/features/issues/components/issues-table.tsx b/packages/react-ui/src/features/issues/components/issues-table.tsx
index bb1c06e7e3d..d59eb712461 100644
--- a/packages/react-ui/src/features/issues/components/issues-table.tsx
+++ b/packages/react-ui/src/features/issues/components/issues-table.tsx
@@ -13,16 +13,11 @@ import { DataTableColumnHeader } from '@/components/ui/data-table-column-header'
 import { PermissionNeededTooltip } from '@/components/ui/permission-needed-tooltip';
 import { toast } from '@/components/ui/use-toast';
 import { useAuthorization } from '@/hooks/authorization-hooks';
-import { flagsHooks } from '@/hooks/flags-hooks';
+import { platformHooks } from '@/hooks/platform-hooks';
 import { authenticationSession } from '@/lib/authentication-session';
 import { formatUtils } from '@/lib/utils';
 import { PopulatedIssue } from '@activepieces/ee-shared';
-import {
-  ApEdition,
-  ApFlagId,
-  FlowRunStatus,
-  Permission,
-} from '@activepieces/shared';
+import { FlowRunStatus, Permission } from '@activepieces/shared';
 
 import { TableTitle } from '../../../components/ui/table-title';
 import { issuesApi } from '../api/issues-api';
@@ -41,8 +36,10 @@ const fetchData = async (
 
 export default function IssuesTable() {
   const navigate = useNavigate();
-  const { data: edition } = flagsHooks.useFlag<ApEdition>(ApFlagId.EDITION);
-  const { refetch } = issueHooks.useIssuesNotification(edition);
+  const { platform } = platformHooks.useCurrentPlatform();
+  const { refetch } = issueHooks.useIssuesNotification(
+    platform.flowIssuesEnabled,
+  );
 
   const handleMarkAsResolved = async (
     flowDisplayName: string,
diff --git a/packages/react-ui/src/features/issues/hooks/issue-hooks.tsx b/packages/react-ui/src/features/issues/hooks/issue-hooks.tsx
index d5e60f7b351..2cf4e19a991 100644
--- a/packages/react-ui/src/features/issues/hooks/issue-hooks.tsx
+++ b/packages/react-ui/src/features/issues/hooks/issue-hooks.tsx
@@ -2,25 +2,22 @@ import { useQuery } from '@tanstack/react-query';
 import { t } from 'i18next';
 
 import { authenticationSession } from '@/lib/authentication-session';
-import { ApEdition } from '@activepieces/shared';
 
 import { issuesApi } from '../api/issues-api';
 
 export const issueHooks = {
-  useIssuesNotification: (edition: ApEdition | null) => {
+  useIssuesNotification: (enabled: boolean) => {
     return useQuery<boolean, Error>({
       queryKey: [
         t('issues-notification'),
         authenticationSession.getProjectId(),
       ],
       queryFn: async () => {
-        if (!edition || edition === ApEdition.COMMUNITY) {
-          return false;
-        }
         const count = await issuesApi.count();
         return count > 0;
       },
       staleTime: Infinity,
+      enabled: enabled,
     });
   },
 };
diff --git a/packages/react-ui/src/features/projects/components/project-switcher.tsx b/packages/react-ui/src/features/projects/components/project-switcher.tsx
index 69d3c96ff06..ac5069fb98f 100644
--- a/packages/react-ui/src/features/projects/components/project-switcher.tsx
+++ b/packages/react-ui/src/features/projects/components/project-switcher.tsx
@@ -3,6 +3,7 @@
 import { CaretSortIcon, CheckIcon } from '@radix-ui/react-icons';
 import { useQueryClient } from '@tanstack/react-query';
 import * as React from 'react';
+import { useLocation } from 'react-router-dom';
 
 import { useEmbedding } from '@/components/embed-provider';
 import { Button } from '@/components/ui/button';
@@ -25,6 +26,7 @@ import { ScrollArea } from '../../../components/ui/scroll-area';
 import { projectHooks } from '../../../hooks/project-hooks';
 
 function ProjectSwitcher() {
+  const location = useLocation();
   const queryClient = useQueryClient();
   const { data: projects } = projectHooks.useProjects();
   const [open, setOpen] = React.useState(false);
@@ -65,9 +67,14 @@ function ProjectSwitcher() {
                     <CommandItem
                       key={project.id}
                       onSelect={() => {
-                        setCurrentProject(queryClient, project);
+                        setCurrentProject(
+                          queryClient,
+                          project,
+                          location.pathname,
+                        );
                         setOpen(false);
                       }}
+                      value={project.id}
                       className="text-sm"
                     >
                       {project.displayName}
diff --git a/packages/react-ui/src/features/team/component/invite-user-dialog.tsx b/packages/react-ui/src/features/team/component/invite-user-dialog.tsx
index 5395392a26d..9741b66ab58 100644
--- a/packages/react-ui/src/features/team/component/invite-user-dialog.tsx
+++ b/packages/react-ui/src/features/team/component/invite-user-dialog.tsx
@@ -159,6 +159,7 @@ export function InviteUserDialog() {
         <DialogTrigger asChild>
           <Button
             variant={'outline'}
+            size="sm"
             className="flex items-center justify-center gap-2 w-full"
           >
             <Plus className="size-4" />
diff --git a/packages/react-ui/src/hooks/project-hooks.ts b/packages/react-ui/src/hooks/project-hooks.ts
index 7745fc1d337..00673b82c17 100644
--- a/packages/react-ui/src/hooks/project-hooks.ts
+++ b/packages/react-ui/src/hooks/project-hooks.ts
@@ -60,14 +60,15 @@ const updateProject = async (
 const setCurrentProject = async (
   queryClient: QueryClient,
   project: ProjectWithLimits,
-  shouldReload = true,
+  pathName?: string,
 ) => {
-  const projectChanged = authenticationSession.getProjectId() !== project.id;
-  if (projectChanged) {
-    await authenticationSession.switchToSession(project.id);
-  }
+  await authenticationSession.switchToSession(project.id);
   queryClient.setQueryData(['current-project'], project);
-  if (projectChanged && shouldReload) {
-    window.location.reload();
+  if (pathName) {
+    const pathNameWithNewProjectId = pathName.replace(
+      /\/projects\/\w+/,
+      `/projects/${project.id}`,
+    );
+    window.location.href = pathNameWithNewProjectId;
   }
 };
diff --git a/packages/react-ui/src/lib/authentication-session.ts b/packages/react-ui/src/lib/authentication-session.ts
index 1ca0da4332b..64185773b2e 100644
--- a/packages/react-ui/src/lib/authentication-session.ts
+++ b/packages/react-ui/src/lib/authentication-session.ts
@@ -38,9 +38,12 @@ export const authenticationSession = {
   isLoggedIn(): boolean {
     return !!this.getToken() && !!this.getCurrentUser();
   },
-  logOut() {
+  clearSession() {
     localStorage.removeItem(tokenKey);
     localStorage.removeItem(currentUserKey);
+  },
+  logOut() {
+    this.clearSession();
     window.location.href = '/sign-in';
   },
   getCurrentUser(): AuthenticationResponse | null {