diff --git a/docs/docs/documentation/getting-started/installation/backend-config.md b/docs/docs/documentation/getting-started/installation/backend-config.md
index 3c73d3405..98f01fc3e 100644
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -4,22 +4,22 @@
 
 ### General
 
-| Variables                     |        Default        | Description                                                                                        |
-| ----------------------------- | :-------------------: | -------------------------------------------------------------------------------------------------- |
-| PUID                          |          911          | UserID permissions between host OS and container                                                   |
-| PGID                          |          911          | GroupID permissions between host OS and container                                                  |
-| DEFAULT_GROUP                 |         Home          | The default group for users                                                                        |
-| DEFAULT_HOUSEHOLD             |        Family         | The default household for users in each group                                                      |
-| BASE_URL                      | http://localhost:8080 | Used for Notifications                                                                             |
-| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid. Must be <= 87600 (10 years, in hours).         |
-| API_PORT                      |         9000          | The port exposed by backend API. **Do not change this if you're running in Docker**                |
-| API_DOCS                      |         True          | Turns on/off access to the API documentation locally                                               |
-| TZ                            |          UTC          | Must be set to get correct date/time on the server                                                 |
-| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                   |
-| ALLOW_PASSWORD_LOGIN          |         true          | Whether or not to display the username+password input fields. Keep set to true unless you use OIDC authentication |
-| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                 |
-| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                         |
-| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC |
+| Variables                     |        Default        | Description                                                                                                                                             |
+| ----------------------------- | :-------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| PUID                          |          911          | UserID permissions between host OS and container                                                                                                        |
+| PGID                          |          911          | GroupID permissions between host OS and container                                                                                                       |
+| DEFAULT_GROUP                 |         Home          | The default group for users                                                                                                                             |
+| DEFAULT_HOUSEHOLD             |        Family         | The default household for users in each group                                                                                                           |
+| BASE_URL                      | http://localhost:8080 | Used for Notifications                                                                                                                                  |
+| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid. Must be <= 9600 (400 days, in hours).                                                               |
+| API_PORT                      |         9000          | The port exposed by backend API. **Do not change this if you're running in Docker**                                                                     |
+| API_DOCS                      |         True          | Turns on/off access to the API documentation locally                                                                                                    |
+| TZ                            |          UTC          | Must be set to get correct date/time on the server                                                                                                      |
+| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                                                                        |
+| ALLOW_PASSWORD_LOGIN          |         true          | Whether or not to display the username+password input fields. Keep set to true unless you use OIDC authentication                                       |
+| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                                                                      |
+| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                                                                              |
+| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC                                                      |
 
 <super>\*</super> Starting in v1.4.0 this was changed to default to `false` as part of a security review of the application.
 
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
index 6c11f59ed..d146edb29 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
@@ -196,7 +196,7 @@ import { VueDraggable } from "vue-draggable-plus";
 import type { IngredientFood, IngredientUnit, ParsedIngredient, RecipeIngredient } from "~/lib/api/types/recipe";
 import type { Parser } from "~/lib/api/user/recipes/recipe";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { useAppInfo, useUserApi } from "~/composables/api";
+import { useUserApi } from "~/composables/api";
 import { parseIngredientText } from "~/composables/recipes";
 import { useFoodData, useFoodStore, useUnitData, useUnitStore } from "~/composables/store";
 import { useGlobalI18n } from "~/composables/use-global-i18n";
@@ -213,9 +213,9 @@ const emit = defineEmits<{
   (e: "save", value: NoUndefinedField<RecipeIngredient[]>): void;
 }>();
 
+const { $appInfo } = useNuxtApp();
 const i18n = useGlobalI18n();
 const api = useUserApi();
-const appInfo = useAppInfo();
 const drag = ref(false);
 
 const unitStore = useUnitStore();
@@ -238,7 +238,7 @@ const availableParsers = computed(() => {
     {
       text: i18n.t("recipe.parser.openai-parser"),
       value: "openai",
-      hide: !appInfo.value?.enableOpenai,
+      hide: !$appInfo.enableOpenai,
     },
   ];
 });
diff --git a/frontend/components/Layout/DefaultLayout.vue b/frontend/components/Layout/DefaultLayout.vue
index a45d7da8b..97b19cc28 100644
--- a/frontend/components/Layout/DefaultLayout.vue
+++ b/frontend/components/Layout/DefaultLayout.vue
@@ -97,7 +97,6 @@
 <script lang="ts">
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import type { SideBarLink } from "~/types/application-types";
-import { useAppInfo } from "~/composables/api";
 import { useCookbookPreferences } from "~/composables/use-users/preferences";
 import { useCookbookStore, usePublicCookbookStore } from "~/composables/store/use-cookbook-store";
 import type { ReadCookBook } from "~/lib/api/types/cookbook";
@@ -105,7 +104,7 @@ import type { ReadCookBook } from "~/lib/api/types/cookbook";
 export default defineNuxtComponent({
   setup() {
     const i18n = useI18n();
-    const { $globals } = useNuxtApp();
+    const { $appInfo, $globals } = useNuxtApp();
     const display = useDisplay();
     const $auth = useMealieAuth();
     const { isOwnGroup } = useLoggedInState();
@@ -135,9 +134,7 @@ export default defineNuxtComponent({
       return [];
     });
 
-    const appInfo = useAppInfo();
-    const showImageImport = computed(() => appInfo.value?.enableOpenaiImageServices);
-
+    const showImageImport = computed(() => $appInfo.enableOpenaiImageServices);
     const languageDialog = ref<boolean>(false);
 
     const sidebar = ref<boolean>(false);
diff --git a/frontend/composables/api/index.ts b/frontend/composables/api/index.ts
index 20d74981d..f94569ff8 100644
--- a/frontend/composables/api/index.ts
+++ b/frontend/composables/api/index.ts
@@ -1,3 +1,2 @@
-export { useAppInfo } from "./use-app-info";
 export { useStaticRoutes } from "./static-routes";
 export { useAdminApi, usePublicApi, usePublicExploreApi, useUserApi } from "./api-client";
diff --git a/frontend/composables/api/use-app-info.ts b/frontend/composables/api/use-app-info.ts
deleted file mode 100644
index 237fd96cc..000000000
--- a/frontend/composables/api/use-app-info.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { AppInfo } from "~/lib/api/types/admin";
-
-export function useAppInfo(): Ref<AppInfo | null> {
-  const i18n = useI18n();
-  const { $axios } = useNuxtApp();
-  $axios.defaults.headers.common["Accept-Language"] = i18n.locale.value;
-
-  const { data: appInfo } = useAsyncData("app-info", async () => {
-    const data = await $axios.get<AppInfo>("/api/app/about");
-    return data.data;
-  });
-
-  return appInfo;
-}
diff --git a/frontend/composables/use-users/user-ratings.ts b/frontend/composables/use-users/user-ratings.ts
index 36cd03d2e..56dd31dfe 100644
--- a/frontend/composables/use-users/user-ratings.ts
+++ b/frontend/composables/use-users/user-ratings.ts
@@ -5,9 +5,9 @@ const userRatings = ref<UserRatingSummary[]>([]);
 const loading = ref(false);
 const ready = ref(false);
 
-const $auth = useMealieAuth();
-
 export const useUserSelfRatings = function () {
+  const $auth = useMealieAuth();
+
   async function refreshUserRatings() {
     if (!$auth.user.value || loading.value) {
       return;
diff --git a/frontend/composables/useAuthBackend.ts b/frontend/composables/useAuthBackend.ts
index 2a796b835..cc21bb6bf 100644
--- a/frontend/composables/useAuthBackend.ts
+++ b/frontend/composables/useAuthBackend.ts
@@ -23,13 +23,15 @@ const authUser = ref<UserOut | null>(null);
 const authStatus = ref<"loading" | "authenticated" | "unauthenticated">("loading");
 
 export const useAuthBackend = function (): AuthState {
-  const { $axios } = useNuxtApp();
+  const { $appInfo, $axios } = useNuxtApp();
   const router = useRouter();
 
   const runtimeConfig = useRuntimeConfig();
-  const tokenTimeHours = Number(runtimeConfig.public.TOKEN_TIME) || 48;
   const tokenName = runtimeConfig.public.AUTH_TOKEN;
-  const tokenCookie = useCookie(tokenName, { maxAge: tokenTimeHours * 60 * 60 });
+  const tokenCookie = useCookie(tokenName, {
+    maxAge: $appInfo.tokenTime * 60 * 60,
+    secure: $appInfo.production && window?.location?.protocol === "https:",
+  });
 
   function setToken(token: string | null) {
     tokenCookie.value = token;
diff --git a/frontend/layouts/blank.vue b/frontend/layouts/blank.vue
index e0d45f90b..45c86d5de 100644
--- a/frontend/layouts/blank.vue
+++ b/frontend/layouts/blank.vue
@@ -3,11 +3,11 @@
     <TheSnackbar />
 
     <v-banner
-      v-if="isDemo"
+      v-if="$appInfo.demoStatus"
       sticky
     >
       <div class="text-center">
-        <b> {{ $t("demo.info_message_with_version", { version: version }) }} </b>
+        <b> {{ $t("demo.info_message_with_version", { version: $appInfo.version }) }} </b>
       </div>
     </v-banner>
 
@@ -23,24 +23,8 @@
 
 <script lang="ts">
 import TheSnackbar from "~/components/Layout/LayoutParts/TheSnackbar.vue";
-import { useAppInfo } from "~/composables/api";
-import { useGlobalI18n } from "~/composables/use-global-i18n";
 
 export default defineNuxtComponent({
   components: { TheSnackbar },
-  setup() {
-    const appInfo = useAppInfo();
-
-    const isDemo = computed(() => appInfo?.value?.demoStatus || false);
-
-    const i18n = useGlobalI18n();
-    const version = computed(() => appInfo?.value?.version || i18n.t("about.unknown-version"));
-
-    return {
-      appInfo,
-      isDemo,
-      version,
-    };
-  },
 });
 </script>
diff --git a/frontend/lib/api/types/admin.ts b/frontend/lib/api/types/admin.ts
index fcb33e202..a596fc210 100644
--- a/frontend/lib/api/types/admin.ts
+++ b/frontend/lib/api/types/admin.ts
@@ -18,6 +18,7 @@ export interface AdminAboutInfo {
   oidcProviderName: string;
   enableOpenai: boolean;
   enableOpenaiImageServices: boolean;
+  tokenTime: number;
   versionLatest: string;
   apiPort: number;
   apiDocs: boolean;
@@ -50,6 +51,7 @@ export interface AppInfo {
   oidcProviderName: string;
   enableOpenai: boolean;
   enableOpenaiImageServices: boolean;
+  tokenTime: number;
 }
 export interface AppStartupInfo {
   isFirstLogin: boolean;
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index ed49e74d4..3c89549dc 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -72,7 +72,6 @@ export default defineNuxtConfig({
     apiUrl: process.env.API_URL || "http://localhost:9000",
     public: {
       AUTH_TOKEN,
-      TOKEN_TIME: process.env.TOKEN_TIME || "48",
       GLOBAL_MIDDLEWARE: process.env.GLOBAL_MIDDLEWARE || undefined,
       SUB_PATH: process.env.SUB_PATH || "",
       // ==============================================
diff --git a/frontend/pages/g/[groupSlug]/r/create.vue b/frontend/pages/g/[groupSlug]/r/create.vue
index 37ae21311..54108921f 100644
--- a/frontend/pages/g/[groupSlug]/r/create.vue
+++ b/frontend/pages/g/[groupSlug]/r/create.vue
@@ -43,7 +43,6 @@
 </template>
 
 <script lang="ts">
-import { useAppInfo } from "~/composables/api";
 import type { MenuItem } from "~/components/global/BaseOverflowButton.vue";
 import AdvancedOnly from "~/components/global/AdvancedOnly.vue";
 
@@ -53,15 +52,12 @@ export default defineNuxtComponent({
   setup() {
     const i18n = useI18n();
     const $auth = useMealieAuth();
-    const $globals = useNuxtApp().$globals;
+    const { $appInfo, $globals } = useNuxtApp();
 
     useSeoMeta({
       title: i18n.t("general.create"),
     });
 
-    const appInfo = useAppInfo();
-    const enableOpenAIImages = computed(() => appInfo.value?.enableOpenaiImageServices);
-
     const subpages = computed<MenuItem[]>(() => [
       {
         icon: $globals.icons.link,
@@ -82,7 +78,7 @@ export default defineNuxtComponent({
         icon: $globals.icons.fileImage,
         text: i18n.t("recipe.create-from-images"),
         value: "image",
-        hide: !enableOpenAIImages.value,
+        hide: !$appInfo.enableOpenaiImageServices,
       },
       {
         icon: $globals.icons.edit,
diff --git a/frontend/pages/g/[groupSlug]/r/create/debug.vue b/frontend/pages/g/[groupSlug]/r/create/debug.vue
index 1bcb9ea34..d13c52a02 100644
--- a/frontend/pages/g/[groupSlug]/r/create/debug.vue
+++ b/frontend/pages/g/[groupSlug]/r/create/debug.vue
@@ -25,7 +25,7 @@
             persistent-hint
           />
         </v-card-text>
-        <v-card-text v-if="appInfo && appInfo.enableOpenai">
+        <v-card-text v-if="$appInfo.enableOpenai">
           {{ $t('recipe.recipe-debugger-use-openai-description') }}
           <v-checkbox
             v-model="useOpenAI"
@@ -68,7 +68,7 @@
 </template>
 
 <script lang="ts">
-import { useAppInfo, useUserApi } from "~/composables/api";
+import { useUserApi } from "~/composables/api";
 import { validators } from "~/composables/use-validators";
 import type { Recipe } from "~/lib/api/types/recipe";
 
@@ -83,7 +83,6 @@ export default defineNuxtComponent({
     const api = useUserApi();
     const route = useRoute();
     const router = useRouter();
-    const appInfo = useAppInfo();
 
     const recipeUrl = computed({
       set(recipe_import_url: string | null) {
@@ -115,7 +114,6 @@ export default defineNuxtComponent({
     }
 
     return {
-      appInfo,
       recipeUrl,
       debugTreeView,
       debugUrl,
diff --git a/frontend/pages/login.vue b/frontend/pages/login.vue
index 1578c1a39..b36e24ac1 100644
--- a/frontend/pages/login.vue
+++ b/frontend/pages/login.vue
@@ -59,7 +59,7 @@
       <v-card-text class="w-100">
         <v-form @submit.prevent="authenticate">
           <v-text-field
-            v-if="allowPasswordLogin"
+            v-if="$appInfo.allowPasswordLogin"
             v-model="form.email"
             :prepend-inner-icon="$globals.icons.email"
             variant="solo-filled"
@@ -72,7 +72,7 @@
             type="text"
           />
           <v-text-field
-            v-if="allowPasswordLogin"
+            v-if="$appInfo.allowPasswordLogin"
             id="password"
             v-model="form.password"
             :prepend-inner-icon="$globals.icons.lock"
@@ -86,12 +86,12 @@
             @click:append-inner="togglePasswordShow"
           />
           <v-checkbox
-            v-if="allowPasswordLogin"
+            v-if="$appInfo.allowPasswordLogin"
             v-model="form.remember"
             class="ml-2 mt-n2"
             :label="$t('user.remember-me')"
           />
-          <v-card-actions v-if="allowPasswordLogin" class="justify-center pt-0">
+          <v-card-actions v-if="$appInfo.allowPasswordLogin" class="justify-center pt-0">
             <div class="max-button">
               <v-btn
                 :loading="loggingIn"
@@ -110,7 +110,7 @@
           </v-card-actions>
 
           <div
-            v-if="appInfoLoaded && allowOidc && allowPasswordLogin"
+            v-if="$appInfo.enableOidc && $appInfo.allowPasswordLogin"
             class="d-flex my-4 justify-center align-center"
             width="80%"
           >
@@ -126,7 +126,7 @@
             </span>
           </div>
           <v-card-actions
-            v-if="appInfoLoaded && allowOidc"
+            v-if="$appInfo.enableOidc"
             class="justify-center"
           >
             <div class="max-button">
@@ -140,7 +140,7 @@
                 block
                 @click="() => oidcAuthenticate()"
               >
-                {{ $t("user.login-oidc") }} {{ oidcProviderName }}
+                {{ $t("user.login-oidc") }} {{ $appInfo.oidcProviderName }}
               </v-btn>
             </div>
           </v-card-actions>
@@ -148,7 +148,7 @@
       </v-card-text>
       <v-card-actions class="d-flex justify-center flex-column flex-sm-row">
         <v-btn
-          v-if="allowSignup && allowPasswordLogin"
+          v-if="$appInfo.allowSignup && $appInfo.allowPasswordLogin"
           variant="text"
           to="/register"
         >
@@ -162,7 +162,7 @@
           {{ $t("user.invite-only") }}
         </v-btn>
         <v-btn
-          v-if="allowPasswordLogin"
+          v-if="$appInfo.allowPasswordLogin"
           class="mr-auto"
           variant="text"
           to="/forgot-password"
@@ -212,7 +212,6 @@
 <script lang="ts">
 import { useDark, whenever } from "@vueuse/core";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
-import { useAppInfo } from "~/composables/api";
 import { usePasswordField } from "~/composables/use-passwords";
 import { alert } from "~/composables/use-toast";
 import { useAsyncKey } from "~/composables/use-utils";
@@ -229,7 +228,7 @@ export default defineNuxtComponent({
     const router = useRouter();
     const i18n = useI18n();
     const $auth = useMealieAuth();
-    const { $axios } = useNuxtApp();
+    const { $appInfo, $axios } = useNuxtApp();
     const { loggedIn } = useLoggedInState();
     const groupSlug = computed(() => $auth.user.value?.groupSlug);
     const isDemo = ref(false);
@@ -276,19 +275,10 @@ export default defineNuxtComponent({
     const loggingIn = ref(false);
     const oidcLoggingIn = ref(false);
 
-    const appInfo = useAppInfo();
-
     const { passwordIcon, inputType, togglePasswordShow } = usePasswordField();
 
-    const appInfoLoaded = computed(() => appInfo.value !== null);
-    const allowSignup = computed(() => appInfo.value?.allowSignup || false);
-    const allowOidc = computed(() => appInfo.value?.enableOidc || false);
-    const oidcRedirect = computed(() => appInfo.value?.oidcRedirect || false);
-    const oidcProviderName = computed(() => appInfo.value?.oidcProviderName || "OAuth");
-    const allowPasswordLogin = computed(() => appInfo.value?.allowPasswordLogin ?? true);
-
     whenever(
-      () => appInfoLoaded.value && allowOidc.value && oidcRedirect.value && !isCallback() && !isDirectLogin() /* && !$auth.check().valid */,
+      () => $appInfo.enableOidc && $appInfo.oidcRedirect && !isCallback() && !isDirectLogin() /* && !$auth.check().valid */,
       () => oidcAuthenticate(),
       { immediate: true },
     );
@@ -368,13 +358,8 @@ export default defineNuxtComponent({
       isDark,
       form,
       loggingIn,
-      appInfoLoaded,
-      allowSignup,
-      allowPasswordLogin,
-      allowOidc,
       authenticate,
       oidcAuthenticate,
-      oidcProviderName,
       oidcLoggingIn,
       passwordIcon,
       inputType,
diff --git a/frontend/plugins/app-info.client.ts b/frontend/plugins/app-info.client.ts
new file mode 100644
index 000000000..6bcce2e47
--- /dev/null
+++ b/frontend/plugins/app-info.client.ts
@@ -0,0 +1,14 @@
+import axios from "axios";
+import type { AppInfo } from "~/lib/api/types/admin";
+
+export default defineNuxtPlugin({
+  async setup() {
+    const { data } = await axios.get<AppInfo>("/api/app/about");
+
+    return {
+      provide: {
+        appInfo: data,
+      },
+    };
+  },
+});
diff --git a/mealie/core/settings/settings.py b/mealie/core/settings/settings.py
index 91238e8ca..c97eea34f 100644
--- a/mealie/core/settings/settings.py
+++ b/mealie/core/settings/settings.py
@@ -128,11 +128,8 @@ class AppSettings(AppLoggingSettings):
     def validate_token_time(cls, v: int) -> int:
         if v < 1:
             raise ValueError("TOKEN_TIME must be at least 1 hour")
-        # If TOKEN_TIME is unreasonably high (e.g. hundreds of years), JWT encoding
-        # can overflow, so we set the max to 10 years (87600 hours).
-        if v > 87600:
-            raise ValueError("TOKEN_TIME is too high; maximum is 87600 hours (10 years)")
-        return v
+        # Certain browsers (webkit) have issues with very long-lived cookies, so we limit to 400 days
+        return min(v, 400 * 24)
 
     SECRET: str
     SESSION_SECRET: str
diff --git a/mealie/routes/admin/admin_about.py b/mealie/routes/admin/admin_about.py
index 5986cc4f0..fbf15846e 100644
--- a/mealie/routes/admin/admin_about.py
+++ b/mealie/routes/admin/admin_about.py
@@ -30,6 +30,7 @@ class AdminAboutController(BaseAdminController):
             default_household=settings.DEFAULT_HOUSEHOLD,
             allow_signup=settings.ALLOW_SIGNUP,
             allow_password_login=settings.ALLOW_PASSWORD_LOGIN,
+            token_time=settings.TOKEN_TIME,
             build_id=settings.GIT_COMMIT_HASH,
             recipe_scraper_version=recipe_scraper_version.__version__,
             enable_oidc=settings.OIDC_AUTH_ENABLED,
diff --git a/mealie/routes/app/app_about.py b/mealie/routes/app/app_about.py
index ae9b8e7aa..1a8ad483e 100644
--- a/mealie/routes/app/app_about.py
+++ b/mealie/routes/app/app_about.py
@@ -44,6 +44,7 @@ def get_app_info(session: Session = Depends(generate_session)):
         enable_openai=settings.OPENAI_ENABLED,
         enable_openai_image_services=settings.OPENAI_ENABLED and settings.OPENAI_ENABLE_IMAGE_SERVICES,
         allow_password_login=settings.ALLOW_PASSWORD_LOGIN,
+        token_time=settings.TOKEN_TIME,
     )
 
 
diff --git a/mealie/routes/auth/auth.py b/mealie/routes/auth/auth.py
index 89b3c09a7..56b94ade7 100644
--- a/mealie/routes/auth/auth.py
+++ b/mealie/routes/auth/auth.py
@@ -1,4 +1,4 @@
-from typing import Annotated, Literal
+from typing import Annotated
 
 from authlib.integrations.starlette_client import OAuth
 from fastapi import APIRouter, Depends, Header, Request, Response, status
@@ -54,59 +54,13 @@ class MealieAuthToken(BaseModel):
     access_token: str
     token_type: str = "bearer"
 
-    @classmethod
-    def set_cookie(
-        cls, response: Response, token: str, *, expires_in: int | float | None = None, samesite: str | None = None
-    ):
-        expires_in = int(expires_in) if expires_in else None
-
-        # httponly=False to allow JS access for frontend
-        response.set_cookie(
-            key="mealie.access_token",
-            value=token,
-            httponly=False,
-            max_age=expires_in,
-            secure=settings.PRODUCTION,
-            samesite=samesite,
-        )
-
     @classmethod
     def respond(cls, token: str, token_type: str = "bearer") -> dict:
         return cls(access_token=token, token_type=token_type).model_dump()
 
 
-def get_samesite(request: Request) -> Literal["lax", "none"]:
-    """
-    Determine the appropriate samesite attribute for cookies.
-
-    `samesite="none"` is required for iframe support (i.e. embedding Mealie in another site)
-    but only works over HTTPS. If `samesite="none"` is set over HTTP, most browsers will reject the cookie.
-
-    `samesite="lax"` is the default, which works regardless of HTTP or HTTPS,
-    but does not support hosting in iframes.
-    """
-
-    forwarded_proto = request.headers.get("x-forwarded-proto", "").lower()
-    is_https = request.url.scheme == "https" or forwarded_proto == "https"
-
-    if is_https and settings.PRODUCTION:
-        return "none"
-    else:
-        # TODO: remove this once we resolve pending iframe issues
-        if settings.PRODUCTION:
-            logger.debug("Setting samesite to 'lax' because connection is not HTTPS")
-            logger.debug(f"{request.url.scheme=} | {forwarded_proto=}")
-
-        return "lax"
-
-
 @public_router.post("/token")
-def get_token(
-    request: Request,
-    response: Response,
-    data: CredentialsRequestForm = Depends(),
-    session: Session = Depends(generate_session),
-):
+def get_token(request: Request, data: CredentialsRequestForm = Depends(), session: Session = Depends(generate_session)):
     if "x-forwarded-for" in request.headers:
         ip = request.headers["x-forwarded-for"]
         if "," in ip:  # if there are multiple IPs, the first one is canonically the true client
@@ -128,15 +82,7 @@ def get_token(
             status_code=status.HTTP_401_UNAUTHORIZED,
         )
 
-    access_token, duration = auth
-    expires_in = duration.total_seconds() if duration else None
-
-    MealieAuthToken.set_cookie(
-        response,
-        access_token,
-        expires_in=expires_in,
-        samesite=get_samesite(request),
-    )
+    access_token, _ = auth
     return MealieAuthToken.respond(access_token)
 
 
@@ -160,7 +106,7 @@ async def oauth_login(request: Request):
 
 
 @public_router.get("/oauth/callback")
-async def oauth_callback(request: Request, response: Response, session: Session = Depends(generate_session)):
+async def oauth_callback(request: Request, session: Session = Depends(generate_session)):
     if not oauth:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
@@ -186,15 +132,7 @@ async def oauth_callback(request: Request, response: Response, session: Session
     if not auth:
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
 
-    access_token, duration = auth
-    expires_in = duration.total_seconds() if duration else None
-
-    MealieAuthToken.set_cookie(
-        response,
-        access_token,
-        expires_in=expires_in,
-        samesite=get_samesite(request),
-    )
+    access_token, _ = auth
     return MealieAuthToken.respond(access_token)
 
 
diff --git a/mealie/schema/admin/about.py b/mealie/schema/admin/about.py
index fdc14da04..722f7c4ad 100644
--- a/mealie/schema/admin/about.py
+++ b/mealie/schema/admin/about.py
@@ -23,6 +23,7 @@ class AppInfo(MealieModel):
     oidc_provider_name: str
     enable_openai: bool
     enable_openai_image_services: bool
+    token_time: int
 
 
 class AppTheme(MealieModel):
diff --git a/tests/e2e/playwright.config.ts b/tests/e2e/playwright.config.ts
index 38e7f74a3..fe445e4d0 100644
--- a/tests/e2e/playwright.config.ts
+++ b/tests/e2e/playwright.config.ts
@@ -12,7 +12,7 @@ import { defineConfig, devices } from '@playwright/test';
 export default defineConfig({
   testDir: './.',
   /* Run tests in files in parallel */
-  fullyParallel: true,
+  fullyParallel: false,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */