diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index 8975f1c1e7..f727929a20 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -1,10 +1,10 @@
 import {Component} from 'angular2/core';
 import {Router, RouteConfig, ROUTER_DIRECTIVES} from 'angular2/router';
-import {Authentication} from './services/authentication';
+import {Authentication} from 'ng2-alfresco-login/ng2-alfresco-login';
 import {AlfrescoService} from 'ng2-alfresco-documentlist/ng2-alfresco-documentlist';
 import {MDL} from './components/common/MaterialDesignLiteUpgradeElement';
 import {FilesComponent} from './components/files/files.component';
-import {LoginComponent} from './components/login/login.component';
+import {Login} from 'ng2-alfresco-login/ng2-alfresco-login';
 import {AuthRouterOutlet} from './components/router/AuthRouterOutlet';
 
 declare var document: any;
@@ -16,7 +16,7 @@ declare var document: any;
 })
 @RouteConfig([
     {path: '/', name: 'Files', component: FilesComponent, useAsDefault: true},
-    {path: '/login', name: 'Login', component: LoginComponent}
+    {path: '/login', name: 'Login', component: Login}
 ])
 export class AppComponent {
 
diff --git a/demo-shell-ng2/app/components/login/login.component.ts b/demo-shell-ng2/app/components/login/login.component.ts
index 5b70f5f464..e88d5e003f 100644
--- a/demo-shell-ng2/app/components/login/login.component.ts
+++ b/demo-shell-ng2/app/components/login/login.component.ts
@@ -1,7 +1,7 @@
 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 {Authentication} from 'ng2-alfresco-login/ng2-alfresco-login';
 declare let componentHandler;
 
 @Component({
diff --git a/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts b/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
index 7ff475599d..6a23d51eee 100644
--- a/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
+++ b/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
@@ -1,6 +1,6 @@
 import { ElementRef, DynamicComponentLoader, Directive, Attribute } from 'angular2/core';
 import { Router, RouterOutlet, ComponentInstruction } from 'angular2/router';
-import {Authentication} from '../../services/authentication';
+import {Authentication} from 'ng2-alfresco-login/ng2-alfresco-login';
 
 @Directive({selector: 'auth-router-outlet'})
 export class AuthRouterOutlet extends RouterOutlet {
diff --git a/demo-shell-ng2/app/main.ts b/demo-shell-ng2/app/main.ts
index 2d21904f1f..b4c3ccbdf6 100644
--- a/demo-shell-ng2/app/main.ts
+++ b/demo-shell-ng2/app/main.ts
@@ -2,12 +2,12 @@ import {bootstrap}    from 'angular2/platform/browser';
 import {AppComponent} from './app.component';
 import {ROUTER_PROVIDERS} from 'angular2/router';
 import {HTTP_PROVIDERS}    from 'angular2/http';
-import {Authentication} from './services/authentication';
+import {ALFRESCO_AUTHENTICATION} from 'ng2-alfresco-login/ng2-alfresco-login';
 import {ALFRESCO_PROVIDERS} from 'ng2-alfresco-documentlist/ng2-alfresco-documentlist';
 
 bootstrap(AppComponent, [
     ROUTER_PROVIDERS,
     HTTP_PROVIDERS,
-    Authentication,
+    ALFRESCO_AUTHENTICATION,
     ALFRESCO_PROVIDERS
 ]);
diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index fe544456d1..f3db922faf 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -35,7 +35,8 @@
         System.config({
             map: {
                 'ng2-uploader': 'node_modules/ng2-uploader',
-                'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist'
+                'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist',
+                'ng2-alfresco-login': 'node_modules/ng2-alfresco-login'
             },
             packages: {
                 app: {
@@ -47,6 +48,9 @@
                 },
                 'ng2-alfresco-documentlist': {
                     defaultExtension: 'js'
+                },
+                'ng2-alfresco-login': {
+                    defaultExtension: 'js'
                 }
             }
         });
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index a82bc69d98..e8bbbfdbcc 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -23,6 +23,7 @@
     "jquery": "^2.2.2",
     "material-design-lite": "^1.1.3",
     "ng2-alfresco-documentlist": "file:../ng2-components/ng2-alfresco-documentlist",
+    "ng2-alfresco-login": "file:../ng2-components/ng2-alfresco-login",
     "ng2-uploader": "denisvuyka/ng2-uploader",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",