diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index a036590ed5..e1a82f4a33 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -54,7 +54,7 @@ describe('AuthNavMenuComponent', () => {
         ],
         providers: [
           {provide: HostWindowService, useValue: window},
-          {provide: AuthService, useValue: {setRedirectUrl: () => {}}}
+          {provide: AuthService, useValue: {setRedirectUrl: () => { /*empty*/ }}}
         ],
         schemas: [
           CUSTOM_ELEMENTS_SCHEMA
@@ -224,7 +224,7 @@ describe('AuthNavMenuComponent', () => {
         ],
         providers: [
           {provide: HostWindowService, useValue: window},
-          {provide: AuthService, useValue: {setRedirectUrl: () => {}}}
+          {provide: AuthService, useValue: {setRedirectUrl: () => { /*empty*/ }}}
         ],
         schemas: [
           CUSTOM_ELEMENTS_SCHEMA
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index f7e1b03c88..c657071987 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -62,8 +62,12 @@ export class AuthNavMenuComponent implements OnInit {
     this.showAuth = this.store.select(routerStateSelector)
       .filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state))
       .map((router: RouterReducerState) => {
-        return !router.state.url.startsWith(LOGIN_ROUTE) && !router.state.url.startsWith(LOGOUT_ROUTE);
-
+        const url = router.state.url;
+        const show = !router.state.url.startsWith(LOGIN_ROUTE) && !router.state.url.startsWith(LOGOUT_ROUTE);
+        if (show) {
+          this.authService.setRedirectUrl(url);
+        }
+        return show;
       });
   }
 }