diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html
index 038ac88930..b5e5855bd4 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/index.html
+++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html
@@ -25,10 +25,6 @@
     <!-- Additional Alfresco libraries -->
     <script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
 
-    <script>
-        localStorage.setItem('token', '<AUTH-TOKEN>');
-    </script>
-
     <script>
         System.config({
             defaultJSExtensions: true,
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
index e7937e799b..a96187367e 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-import { Component } from 'angular2/core';
+import { Component, OnInit } from 'angular2/core';
 import { bootstrap } from 'angular2/platform/browser';
-import { HTTP_PROVIDERS } from 'angular2/http';
+import { Observable } from 'rxjs/Rx';
+import { HTTP_PROVIDERS, Http, Headers, Response } from 'angular2/http';
 
 import {
     ALFRESCO_CORE_PROVIDERS,
@@ -36,7 +37,7 @@ import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-
     selector: 'alfresco-documentlist-demo',
     template: `
         <div class="container">
-            <alfresco-document-list>
+            <alfresco-document-list *ngIf="authenticated">
                 <content-columns>
                     <content-column source="$thumbnail"></content-column>
                     <content-column
@@ -114,8 +115,12 @@ import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-
     providers: [DOCUMENT_LIST_PROVIDERS],
     pipes: [AlfrescoPipeTranslate]
 })
-class DocumentListDemo {
+class DocumentListDemo implements OnInit {
+
+    authenticated: boolean;
+
     constructor(
+        private http: Http,
         settings: AlfrescoSettingsService,
         translation: AlfrescoTranslationService,
         documentActions: DocumentActionsService) {
@@ -125,6 +130,10 @@ class DocumentListDemo {
         documentActions.setHandler('my-handler', this.myDocumentActionHandler.bind(this));
     }
 
+    ngOnInit() {
+        this.login();
+    }
+
     myDocumentActionHandler(obj: any) {
         window.alert('my custom action handler');
     }
@@ -136,6 +145,29 @@ class DocumentListDemo {
     myFolderAction1(event) {
         alert('Custom folder action for ' + event.value.displayName);
     }
+
+    private handleError(error: Response) {
+        console.error('Error when logging in', error);
+        return Observable.throw(error.json().message || 'Server error');
+    }
+
+    login() {
+        let host = 'http://192.168.99.100:8080';
+        let credentials = { "userId": "admin", "password": "admin" };
+        let url = `${host}/alfresco/api/-default-/public/authentication/versions/1/tickets`;
+
+        let headers = new Headers();
+        headers.append('Content-Type', 'application/json');
+        headers.append('Accept', 'application/json');
+
+        this.http.post(url, JSON.stringify(credentials), { headers: headers })
+            .map(res => res.json().entry.id)
+            .catch(this.handleError)
+            .subscribe(token => {
+                localStorage.setItem('token', token);
+                this.authenticated = true;
+            });
+    }
 }
 
 bootstrap(DocumentListDemo, [
diff --git a/ng2-components/ng2-alfresco-login/demo/README.md b/ng2-components/ng2-alfresco-login/demo/README.md
index c1d8756aa8..54b7ec32da 100644
--- a/ng2-components/ng2-alfresco-login/demo/README.md
+++ b/ng2-components/ng2-alfresco-login/demo/README.md
@@ -6,6 +6,17 @@ Install:
 npm install
 ```
 
+Update host and credentials
+
+**src/main.ts**
+```ts
+login() {
+    let host = 'http://192.168.99.100:8080';
+    let credentials = { "userId": "admin", "password": "admin" };
+    ...
+}
+```
+
 Run the project:
 
 ```