diff --git a/apps/login/src/lib/server/cookie.ts b/apps/login/src/lib/server/cookie.ts
index 551d95db5..37c3edd3c 100644
--- a/apps/login/src/lib/server/cookie.ts
+++ b/apps/login/src/lib/server/cookie.ts
@@ -50,7 +50,7 @@ export async function createSessionAndUpdateCookie(command: {
 
   let sessionLifetime = command.lifetime;
 
-  if (!sessionLifetime) {
+  if (!sessionLifetime || !sessionLifetime.seconds) {
     console.warn("No session lifetime provided, using default of 24 hours.");
 
     sessionLifetime = {
@@ -123,7 +123,7 @@ export async function createSessionForIdpAndUpdateCookie({
 
   let sessionLifetime = lifetime;
 
-  if (!sessionLifetime) {
+  if (!sessionLifetime || !sessionLifetime.seconds) {
     console.warn("No IDP session lifetime provided, using default of 24 hours.");
 
     sessionLifetime = {
diff --git a/apps/login/src/lib/server/passkeys.ts b/apps/login/src/lib/server/passkeys.ts
index 83a354a27..30584ca88 100644
--- a/apps/login/src/lib/server/passkeys.ts
+++ b/apps/login/src/lib/server/passkeys.ts
@@ -283,7 +283,7 @@ export async function sendPasskey(command: SendPasskeyCommand) {
       ? loginSettings?.secondFactorCheckLifetime
       : undefined;
 
-  if (!lifetime) {
+  if (!lifetime || !lifetime.seconds) {
     console.warn("No passkey lifetime provided, defaulting to 24 hours");
 
     lifetime = {
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index a9b4d29c6..12adc81ae 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -160,7 +160,7 @@ export async function sendPassword(command: UpdateSessionCommand): Promise<{ err
 
     let lifetime = loginSettings.passwordCheckLifetime;
 
-    if (!lifetime) {
+    if (!lifetime || !lifetime.seconds) {
       console.warn("No password lifetime provided, defaulting to 24 hours");
       lifetime = {
         seconds: BigInt(60 * 60 * 24), // default to 24 hours
diff --git a/apps/login/src/lib/server/session.ts b/apps/login/src/lib/server/session.ts
index 59de5aec5..18ebe10e1 100644
--- a/apps/login/src/lib/server/session.ts
+++ b/apps/login/src/lib/server/session.ts
@@ -148,7 +148,7 @@ export async function updateSession(options: UpdateSessionCommand) {
       ? loginSettings?.secondFactorCheckLifetime
       : undefined;
 
-  if (!lifetime) {
+  if (!lifetime || !lifetime.seconds) {
     console.warn("No lifetime provided for session, defaulting to 24 hours");
     lifetime = {
       seconds: BigInt(60 * 60 * 24), // default to 24 hours
diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.ts b/console/src/app/modules/policies/login-policy/login-policy.component.ts
index 6c167c3a3..1a737a663 100644
--- a/console/src/app/modules/policies/login-policy/login-policy.component.ts
+++ b/console/src/app/modules/policies/login-policy/login-policy.component.ts
@@ -23,7 +23,7 @@ import { WarnDialogComponent } from '../../warn-dialog/warn-dialog.component';
 import { PolicyComponentServiceType } from '../policy-component-types.enum';
 import { LoginMethodComponentType } from './factor-table/factor-table.component';
 import { map, takeUntil } from 'rxjs/operators';
-import { LoginPolicyService } from '../../../services/login-policy.service';
+import { LoginPolicyService } from 'src/app/services/login-policy.service';
 
 const minValueValidator = (minValue: number) => (control: AbstractControl) => {
   const value = control.value;