diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index 5c6e02cbaf..bcde6be5ab 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -215,7 +215,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
                 this.taskPagination = { count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total };
                 console.log({ count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total });
             }, (err) => {
-                console.log('err');
+                console.log('err' +  err);
             });
 
         if (this.router.url.includes('processes')) {
@@ -238,6 +238,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
 
     ngOnDestroy() {
         this.sub.unsubscribe();
+        this.taskListService.tasksList$.subscribe();
     }
 
     onTaskFilterClick(filter: FilterRepresentationModel): void {
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
index 468deab911..ec3312d0f8 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
@@ -32,10 +32,11 @@ import { TaskListModel } from '../models/task-list.model';
 export class TaskListService {
     private tasksListSubject = new Subject<TaskListModel>();
 
-    public tasksList$: Observable<TaskListModel> = this.tasksListSubject.asObservable();
+    public tasksList$: Observable<TaskListModel>;
 
     constructor(private apiService: AlfrescoApiService,
                 private logService: LogService) {
+        this.tasksList$ = this.tasksListSubject.asObservable();
     }
 
     /**
diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.scss b/ng2-components/ng2-alfresco-login/src/components/login.component.scss
index 09230f9cc8..409791106f 100644
--- a/ng2-components/ng2-alfresco-login/src/components/login.component.scss
+++ b/ng2-components/ng2-alfresco-login/src/components/login.component.scss
@@ -66,7 +66,7 @@
         }
 
         .adf-error-container {
-            height: 10px;
+            height: 45px;
         }
 
         .adf-error-message {