diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index 5ee422e46d..aeee137ec9 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -1,6 +1,6 @@
 <!-- Always shows a header, even in smaller screens. -->
 <div mdl class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
-    <header class="mdl-layout__header main_header_adf" [ngClass]="{hide: isLoginPage()}">
+    <header class="mdl-layout__header main_header_adf" [ngClass]="{hide: isAPageWithHeaderBar()}">
         <div class="mdl-button-padding mdl-layout__header-row">
 
             <!-- User Info -->
diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index a6e339bb30..58cb6780ea 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -64,12 +64,12 @@ export class AppComponent {
     }
 
     redirectToLoginPageIfNotLoggedIn(): void {
-        if (!this.isLoginPage() && !this.authService.isLoggedIn()) {
+        if (!this.authService.isLoggedIn()) {
             this.router.navigate(['/login']);
         }
     }
 
-    isLoginPage(): boolean {
+    isAPageWithHeaderBar(): boolean {
         return location.pathname === '/login' || location.pathname === '/settings';
     }