diff --git a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
index 5a1b2c3d05..ced281253d 100644
--- a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
@@ -25,9 +25,9 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy {
       const rememberMeValue = this.rememberMeService.getFromToken(accessToken);
 
       if (rememberMeValue) {
-        this.rememberMeService.set(true);
+        this.rememberMeService.set(!!rememberMeValue);
       } else {
-        this.rememberMeService.set(false)
+        this.rememberMeService.set(!!rememberMeValue)
       }
     }
 
diff --git a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-password-flow-strategy.ts b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-password-flow-strategy.ts
index eddf38a03e..9c38c64e27 100644
--- a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-password-flow-strategy.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-password-flow-strategy.ts
@@ -74,8 +74,8 @@ export class AuthPasswordFlowStrategy extends AuthFlowStrategy {
     return from(this.oAuthService.revokeTokenAndLogout(noRedirectToLogoutUrl)).pipe(
       switchMap(() => this.configState.refreshAppState()),
       tap(() => {
-        router.navigateByUrl('/');
         this.rememberMeService.remove();
+        router.navigateByUrl('/');
       }),
     );
   }