diff --git a/demo-shell-ng2/app/components/login/login.component.css b/demo-shell-ng2/app/components/login/login.component.css
index acc82bf023..30d931a564 100644
--- a/demo-shell-ng2/app/components/login/login.component.css
+++ b/demo-shell-ng2/app/components/login/login.component.css
@@ -1,40 +1,92 @@
-body {
-    padding-top: 40px;
-    padding-bottom: 40px;
-    background-color: #eee;
+.login-card-wide.mdl-card {
+    width: 512px;
+    margin: auto;
+}
+.login-card-wide > .mdl-card__menu {
+    color: #000;
 }
 
-.form-signin {
-    max-width: 330px;
-    padding: 15px;
-    margin: 0 auto;
+
+
+.ng-invalid.ng-invalid.ng-touched {
+    border-color: rgb(222, 50, 38);
+    box-shadow: none;
 }
-.form-signin .form-signin-heading,
-.form-signin .checkbox {
-    margin-bottom: 10px;
+
+.ng-invalid.ng-invalid.ng-touched + label {
+    color: rgb(222, 50, 38);
+    font-size: 12px;
 }
-.form-signin .checkbox {
+
+.ng-invalid.ng-invalid.ng-touched + label:after {
+    background-color: rgb(222, 50, 38);
+}
+
+.ng-invalid.ng-invalid.ng-touched ~ .mdl-tooltip--validation {
+    background-color: rgb(222, 50, 38);
+}
+
+
+.ng-invalid.ng-touched:not(:focus) + label::before {
+    font-family: 'Material Icons';
     font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    /* Preferred icon size */
+
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    /* Support for all WebKit browsers. */
+
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+
+    text-rendering: optimizeLegibility;
+    /* Support for Firefox. */
+
+    -moz-osx-font-smoothing: grayscale;
+    /* Support for IE. */
+
+    font-feature-settings: 'liga';
+    content: "warning";
+    position: absolute;
+    right: 0;
+    bottom: 20px;
 }
-.form-signin .form-control {
-    position: relative;
-    height: auto;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 10px;
-    font-size: 16px;
-}
-.form-signin .form-control:focus {
-    z-index: 2;
-}
-.form-signin input[type="username"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-.form-signin input[type="password"] {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
+
+.ng-valid.ng-touched:not(:focus) + label::before {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    /* Preferred icon size */
+
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    /* Support for all WebKit browsers. */
+
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+
+    text-rendering: optimizeLegibility;
+    /* Support for Firefox. */
+
+    -moz-osx-font-smoothing: grayscale;
+    /* Support for IE. */
+
+    font-feature-settings: 'liga';
+    content: "done";
+    position: absolute;
+    right: 0;
+    bottom: 20px;
+}
\ No newline at end of file
diff --git a/demo-shell-ng2/app/components/login/login.component.html b/demo-shell-ng2/app/components/login/login.component.html
index ed0630e1fe..bf97f55174 100644
--- a/demo-shell-ng2/app/components/login/login.component.html
+++ b/demo-shell-ng2/app/components/login/login.component.html
@@ -1,29 +1,33 @@
-<div class="row">
-    <div class="col-md-4 col-md-offset-4">
-        <form [ngFormModel]="form" (submit)="onSubmit(form.value, $event)" class="form-signin">
-            <div [ngClass]="{'has-error': isErrorStyle(form.controls.username)}" class="form-group">
-                <label for="username">Username</label>
-                <input id="username" class="form-control " type="text" placeholder="username" ngControl="username">
-                <div [hidden]="form.controls.username.valid || form.controls.username.pristine" class="alert alert-danger">
-                    <p *ngIf="form.controls.username.dirty && form.controls.username.errors && form.controls.username.errors.minlength">
-                        Your username needs to be at least 4 characters.
-                    </p>
-                    <p *ngIf="form.controls.username.hasError('required')">
-                        Username is required
-                    </p>
-                </div>
+<div mdl class="login-card-wide mdl-card mdl-shadow--4dp">
+    <form [ngFormModel]="form" (submit)="onSubmit(form.value, $event)">
+        <div class="mdl-card__title">
+            <h2 class="mdl-card__title-text ">Login</h2>
+        </div>
+        <div class="mdl-card__supporting-text">
+            <div [ngClass]="{'is-invalid': isErrorStyle(form.controls.username)}" class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label ">
+                <label for="username" class="mdl-textfield__label">Username</label>
+                <input type="text" class="mdl-textfield__input" id="username" ngControl="username" />
+                <span class="mdl-tooltip mdl-tooltip--validation" for="username" *ngIf="form.controls.username.hasError('required')">
+                        <span>Required.</span>
+                </span>
+                <span class="mdl-tooltip mdl-tooltip--validation" for="username" *ngIf="form.controls.username.hasError('minlength')">
+                        <span>Your username needs to be at least 4 characters.</span>
+                </span>
             </div>
-            <div [ngClass]="{'has-error': isErrorStyle(form.controls.password)}" class="form-group">
-                <label for="password">Password</label>
-                <input id="password" class="form-control" type="password" placeholder="password" ngControl="password">
-                <div [hidden]="form.controls.password.valid || form.controls.password.pristine" class="alert alert-danger">
-                    <p *ngIf="form.controls.password.hasError('required')">
-                        Password is required
-                    </p>
-                </div>
+
+            <div [ngClass]="{'is-invalid': isErrorStyle(form.controls.password)}" class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+                <label for="password" class="mdl-textfield__label">Password</label>
+                <input type="password" class="mdl-textfield__input" id="password" ngControl="password" />
+                <span class="mdl-tooltip mdl-tooltip--validation" for="password" *ngIf="form.controls.password.hasError('required')">
+                        <span>Required.</span>
+                </span>
             </div>
-            <button type="submit" class="btn btn-lg btn-primary btn-block" [disabled]="!form.valid">Login</button>
-            <div *ngIf="error" class="alert alert-danger">You have entered an invalid username or password</div>
-        </form>
-    </div>
-</div>
+        </div>
+        <div class="mdl-card__actions mdl-card--border">
+            <button type="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored" [disabled]="!form.valid">Login</button>
+        </div>
+        <div class="mdl-card__menu">
+            <div class="mdl-spinner mdl-js-spinner"></div>
+        </div>
+    </form>
+</div>
\ No newline at end of file
diff --git a/demo-shell-ng2/app/components/login/login.ts b/demo-shell-ng2/app/components/login/login.ts
index 6a58cab23b..f11980a555 100644
--- a/demo-shell-ng2/app/components/login/login.ts
+++ b/demo-shell-ng2/app/components/login/login.ts
@@ -2,11 +2,13 @@ import {Component} from 'angular2/core';
 import {Router, ROUTER_DIRECTIVES} from 'angular2/router';
 import {FORM_DIRECTIVES, ControlGroup, FormBuilder, Validators} from 'angular2/common';
 import {Authentication} from '../../services/authentication';
+import {MDL} from '../MaterialDesignLiteUpgradeElement';
+declare let componentHandler;
 
 @Component({
     selector: 'login',
     moduleId: 'app/components/login/login',
-    directives: [ROUTER_DIRECTIVES, FORM_DIRECTIVES],
+    directives: [MDL, ROUTER_DIRECTIVES, FORM_DIRECTIVES],
     templateUrl: 'login.component.html',
     styleUrls: ['login.component.css'],
 })
@@ -15,6 +17,7 @@ export class Login {
     error:boolean = false;
 
     isErrorStyle(field:ControlGroup) {
+        componentHandler.upgradeAllRegistered();
         if (field.valid) {
             return false;
         } else {