diff --git a/frontend/public/components/app.jsx b/frontend/public/components/app.jsx
index b972b0351a..1b8413eecc 100644
--- a/frontend/public/components/app.jsx
+++ b/frontend/public/components/app.jsx
@@ -206,8 +206,6 @@ const App = (props) => {
     }
   };
 
-  const { productName } = getBrandingDetails();
-
   const isNotificationDrawerExpanded = useSelector(
     (state) => !!state.UI.getIn(['notifications', 'isExpanded']),
   );
@@ -223,8 +221,7 @@ const App = (props) => {
   };
 
   const content = (
-    <HelmetProvider>
-      <Helmet titleTemplate={`%s · ${productName}`} defaultTitle={productName} />
+    <>
       <ConsoleNotifier location="BannerTop" />
       <QuickStartDrawer>
         <Flex
@@ -279,7 +276,7 @@ const App = (props) => {
       </QuickStartDrawer>
       <ConsoleNotifier location="BannerBottom" />
       <FeatureFlagExtensionLoader />
-    </HelmetProvider>
+    </>
   );
 
   return (
@@ -324,7 +321,7 @@ const AppRouter = () => {
     <Router history={history} basename={window.SERVER_FLAGS.basePath}>
       <CompatRouter>
         <Routes>
-          <Route path={LOGIN_ERROR_PATH} component={AuthenticationErrorPage} />
+          <Route path={LOGIN_ERROR_PATH} element={<AuthenticationErrorPage />} />
           {standaloneRouteExtensions.map((e) => (
             <Route
               key={e.uid}
@@ -606,6 +603,7 @@ const initApiDiscovery = (storeInstance) => {
 };
 
 graphQLReady.onReady(() => {
+  const { productName } = getBrandingDetails();
   store.dispatch(detectFeatures());
 
   // Global timer to ensure all <Timestamp> components update in sync
@@ -660,19 +658,22 @@ graphQLReady.onReady(() => {
     <React.Suspense fallback={<LoadingBox />}>
       <Provider store={store}>
         <ThemeProvider>
-          <AppInitSDK
-            configurations={{
-              appFetch: appInternalFetch,
-              apiDiscovery: initApiDiscovery,
-              initPlugins,
-            }}
-          >
-            <ToastProvider>
-              <PollConsoleUpdates />
-              <AdmissionWebhookWarningNotifications />
-              <AppRouter />
-            </ToastProvider>
-          </AppInitSDK>
+          <HelmetProvider>
+            <Helmet titleTemplate={`%s · ${productName}`} defaultTitle={productName} />
+            <AppInitSDK
+              configurations={{
+                appFetch: appInternalFetch,
+                apiDiscovery: initApiDiscovery,
+                initPlugins,
+              }}
+            >
+              <ToastProvider>
+                <PollConsoleUpdates />
+                <AdmissionWebhookWarningNotifications />
+                <AppRouter />
+              </ToastProvider>
+            </AppInitSDK>
+          </HelmetProvider>
         </ThemeProvider>
       </Provider>
     </React.Suspense>,
diff --git a/frontend/public/components/error.tsx b/frontend/public/components/error.tsx
index 05ad7d1f23..c9500ae612 100644
--- a/frontend/public/components/error.tsx
+++ b/frontend/public/components/error.tsx
@@ -96,20 +96,28 @@ const LoginErrorMessage: React.FC = () => {
     case 'login_state_error':
       return t('public~There was an error generating login state.');
     case 'cookie_error':
-      return t('public~There was an error setting login state cookie');
-    case 'missing_code':
-      return t('public~Auth code is missing in query param.');
-    case 'missing_state':
-      return t('public~There was an error parsing your state cookie');
-    case 'invalid_code':
-      return t('public~There was an error logging you in. Please log out and try again.');
-    case 'invalid_state':
-      return t('public~There was an error verifying your session. Please log out and try again.');
+      return t('public~There was an error setting login state cookie.');
     case 'logout_error':
       return t('public~There was an error logging you out. Please try again.');
+    case 'auth':
+      // When the error type is set as auth
+      switch (error) {
+        case 'missing_state':
+          return t('public~There was an error parsing your state cookie.');
+        case 'invalid_state':
+          return t(
+            'public~There was an error verifying your session. Please log out and try again.',
+          );
+        case 'missing_code':
+          return t('public~Auth code is missing in query param.');
+        case 'invalid_code':
+          return t('public~There was an error logging you in. Please log out and try again.');
+        default:
+          return t('public~There was an authentication error. Please log out and try again.');
+      }
     default:
       return (
-        <Trans>
+        <Trans ns="public">
           There was an authentication error with the system:
           <CodeBlock>
             <CodeBlockCode>{error}</CodeBlockCode>
@@ -122,6 +130,7 @@ const LoginErrorMessage: React.FC = () => {
 export const AuthenticationErrorPage: React.FC = () => {
   const { t } = useTranslation();
   const title = t('public~Authentication error');
+
   return (
     <>
       <DocumentTitle>{title}</DocumentTitle>
@@ -139,7 +148,7 @@ export const AuthenticationErrorPage: React.FC = () => {
           </Stack>
         }
         customFooter={
-          <ButtonLink variant="link" href="/logout">
+          <ButtonLink variant="primary" href="/">
             {t('public~Try again')}
           </ButtonLink>
         }
diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
index c5ebc2665d..c96c5fc905 100644
--- a/frontend/public/locales/en/public.json
+++ b/frontend/public/locales/en/public.json
@@ -534,12 +534,13 @@
   "There was a problem processing the request. Please try again.": "There was a problem processing the request. Please try again.",
   "There was an error generating OAuth client from OIDC client.": "There was an error generating OAuth client from OIDC client.",
   "There was an error generating login state.": "There was an error generating login state.",
-  "There was an error setting login state cookie": "There was an error setting login state cookie",
+  "There was an error setting login state cookie.": "There was an error setting login state cookie.",
+  "There was an error logging you out. Please try again.": "There was an error logging you out. Please try again.",
+  "There was an error parsing your state cookie.": "There was an error parsing your state cookie.",
+  "There was an error verifying your session. Please log out and try again.": "There was an error verifying your session. Please log out and try again.",
   "Auth code is missing in query param.": "Auth code is missing in query param.",
-  "There was an error parsing your state cookie": "There was an error parsing your state cookie",
   "There was an error logging you in. Please log out and try again.": "There was an error logging you in. Please log out and try again.",
-  "There was an error verifying your session. Please log out and try again.": "There was an error verifying your session. Please log out and try again.",
-  "There was an error logging you out. Please try again.": "There was an error logging you out. Please try again.",
+  "There was an authentication error. Please log out and try again.": "There was an authentication error. Please log out and try again.",
   "There was an authentication error with the system:<1><0>{error}</0></1>": "There was an authentication error with the system:<1><0>{error}</0></1>",
   "Authentication error": "Authentication error",
   "Try again": "Try again",