diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
index 9db494f92..5041ce10f 100644
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -220,7 +220,7 @@ export function SimplifiedPartsJobsListComponent({
           <RbacWrapper action="shop:config">
             <Button
               icon={<SettingOutlined />}
-              onClick={() => history("/parts/parts-settings")}
+              onClick={() => history("/parts/settings")}
               title={t("general.labels.settings")}
             >
               {t("general.labels.settings")}
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 339667694..2c071102b 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,10 +1,10 @@
 import { FloatButton, Layout, Spin } from "antd";
+import { Route, Routes, useNavigate } from "react-router-dom";
 
 // import preval from "preval.macro";
 import { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Route, Routes } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import BreadCrumbs from "../../components/breadcrumbs/breadcrumbs.component";
 import ChatAffixContainer from "../../components/chat-affix/chat-affix.container";
@@ -20,7 +20,7 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
-import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectInstanceConflict, selectPartsManagementOnly } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import useAlertsNotifications from "../../hooks/useAlertsNotifications.jsx";
 
@@ -106,12 +106,14 @@ const { Content } = Layout;
 
 const mapStateToProps = createStructuredSelector({
   conflict: selectInstanceConflict,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  partsManagementOnly: selectPartsManagementOnly
 });
 
-export function Manage({ conflict, bodyshop }) {
+export function Manage({ conflict, bodyshop, partsManagementOnly }) {
   const { t } = useTranslation();
   const [chatVisible] = useState(false);
+  const navigate = useNavigate();
 
   // Centralized alerts handling (fetch + dedupe + notifications)
   useAlertsNotifications();
@@ -132,6 +134,12 @@ export function Manage({ conflict, bodyshop }) {
     });
   }, [t]);
 
+  if (partsManagementOnly) {
+    // This NEEDS to be done this way, DO NOT use the react router, it will cause a ton of side effects
+    window.location = "/parts";
+    return null; // Prevent further rendering
+  }
+
   const AppRouteTable = (
     <Suspense
       fallback={
diff --git a/client/src/pages/parts-settings/parts-settings.page.component.jsx b/client/src/pages/parts-settings/parts-settings.page.component.jsx
index d8d949a9a..ce300727d 100644
--- a/client/src/pages/parts-settings/parts-settings.page.component.jsx
+++ b/client/src/pages/parts-settings/parts-settings.page.component.jsx
@@ -30,7 +30,7 @@ export function PartsSettingsPage({ setSelectedHeader, setBreadcrumbs }) {
         rome: "$t(titles.romeonline)"
       })
     });
-    setSelectedHeader("parts-settings");
+    setSelectedHeader("settings");
     setBreadcrumbs([
       {
         link: "/parts",
diff --git a/client/src/pages/simplified-parts/simplified-parts.page.component.jsx b/client/src/pages/simplified-parts/simplified-parts.page.component.jsx
index 87a5ba956..a181dacde 100644
--- a/client/src/pages/simplified-parts/simplified-parts.page.component.jsx
+++ b/client/src/pages/simplified-parts/simplified-parts.page.component.jsx
@@ -108,7 +108,7 @@ export function SimplifiedPartsPage({ conflict, bodyshop }) {
           }
         />
         <Route
-          path="/parts-settings"
+          path="/settings"
           element={
             <Suspense fallback={<Spin />}>
               <PartsSettingsPage />
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 4d1566402..8076105c3 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -401,12 +401,11 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
           window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
         }
       });
-
-      // Set whether it is for parts management only
-      yield put(setPartsManagementOnly(payload.features.partsManagementOnly));
     } catch (error) {
       console.warn("Couldnt find $crisp.", error.message);
     }
+
+    yield put(setPartsManagementOnly(payload.features.partsManagementOnly));
   } catch (error) {
     yield put(signInFailure(error.message));
   }