diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
index 5c19ac41..7080baf6 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
@@ -25,7 +25,7 @@ export class NavbarComponent {
   async logInOut(): Promise<void> {
     if (this.isLogedIn())
       return this.authService.logoutAsync().then(() => {
-        this.router.navigate(['/']);
+        this.router.navigate(['/login']);
       })
     else
       this.router.navigate(['/login']);
diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
index 893b1edc..de68af4b 100644
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/services/auth.service.ts
@@ -15,11 +15,21 @@ export class AuthService {
   }
 
   login(credentials: { username: string; password: string }): Observable<any> {
-    return this.http.post(`${this.url}/login`, credentials);
+    return this.http.post(`${this.url}/login`, credentials).pipe(
+      tap({
+        next: res => this.#IsAuthenticated = true,
+        error: () => this.#IsAuthenticated = false
+      })
+    )
   }
 
   logout(): Observable<any> {
-    return this.http.post(`${this.url}/logout`, {});
+    return this.http.post(`${this.url}/logout`, {}).pipe(
+      tap({
+        next: res => this.#IsAuthenticated = false,
+        error: () => this.#IsAuthenticated = true
+      })
+    );
   }
 
   async logoutAsync(): Promise<void> {