diff --git a/demo-shell-ng2/app/components/login/login-demo.component.ts b/demo-shell-ng2/app/components/login/login-demo.component.ts
index a95c519933..868b866608 100644
--- a/demo-shell-ng2/app/components/login/login-demo.component.ts
+++ b/demo-shell-ng2/app/components/login/login-demo.component.ts
@@ -88,6 +88,8 @@ export class LoginDemoComponent implements OnInit {
             this.providers = 'ECM';
         } else if (!checked && this.providers === 'ALL') {
             this.providers = 'BPM';
+        } else if (!checked && this.providers === 'ECM') {
+            this.providers = '';
         }
 
         localStorage.setItem('providers', this.providers);
@@ -100,6 +102,8 @@ export class LoginDemoComponent implements OnInit {
             this.providers = 'BPM';
         } else if (!checked && this.providers === 'ALL') {
             this.providers = 'ECM';
+        } else if (!checked && this.providers === 'BPM') {
+            this.providers = '';
         }
 
         localStorage.setItem('providers', this.providers);
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index cfdcfa6541..2e0e8f2a23 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -171,7 +171,7 @@ export class AlfrescoLoginComponent implements OnInit {
      * @returns {boolean}
      */
     private checkRequiredParams(): boolean {
-        if (this.providers === undefined) {
+        if (this.providers === undefined || this.providers === null || this.providers === '') {
             this.errorMsg = 'LOGIN.MESSAGES.LOGIN-ERROR-PROVIDERS';
             this.enableError();
             let messageProviders: any;