diff --git a/Front/skydivelogs-app/src/app/app.component.ts b/Front/skydivelogs-app/src/app/app.component.ts
index 09ec73f..06d9bad 100644
--- a/Front/skydivelogs-app/src/app/app.component.ts
+++ b/Front/skydivelogs-app/src/app/app.component.ts
@@ -41,6 +41,6 @@ export class AppComponent implements OnInit {
   logout() {
     this.authenticationService.logout();
     this.showMenu = !this.showMenu;
-    this.router.navigate(["/login"]);
+    this.router.navigate(["/login"], { skipLocationChange: true });
   }
 }
diff --git a/Front/skydivelogs-app/src/services/auth-guard.service.ts b/Front/skydivelogs-app/src/services/auth-guard.service.ts
index b9e5e6f..e2aa522 100644
--- a/Front/skydivelogs-app/src/services/auth-guard.service.ts
+++ b/Front/skydivelogs-app/src/services/auth-guard.service.ts
@@ -25,7 +25,10 @@ export class AuthGuardService implements CanActivate {
     }
 
     // not logged in so redirect to login page with the return url
-    this.router.navigate(["/login"], { queryParams: { returnUrl: state.url } });
+    this.router.navigate(["/login"], {
+      skipLocationChange: true,
+      queryParams: { returnUrl: state.url }
+    });
     return false;
   }
 }