diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js
index e32efb0519..745ce1f0fa 100644
--- a/ng2-components/ng2-alfresco-login/karma.conf.js
+++ b/ng2-components/ng2-alfresco-login/karma.conf.js
@@ -44,7 +44,7 @@ module.exports = function (config) {
 
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_DEBUG,
+    logLevel: config.LOG_INFO,
 
     colors: true,
 
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
index 51bdffa5c9..26e576fb89 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
@@ -2,7 +2,7 @@
     <div class="login-card-wide mdl-card mdl-shadow--4dp">
         <form [ngFormModel]="form" (submit)="onSubmit(form.value, $event)">
             <div class="mdl-card__title alfresco-logo">
-                <img class="center" [src]="__baseUrl + '/../assets/images/logo_for_light_bg_28.png'">
+                <img class="center" [src]="baseComponentPath + '/../assets/images/logo_for_light_bg_28.png'">
             </div>
             <div class="mdl-card__supporting-text">
                 <div class="error">
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 f0a81c9e4c..313528345c 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
@@ -37,7 +37,7 @@ declare let __moduleName: string;
 })
 export class AlfrescoLoginComponent {
 
-    __baseUrl = __moduleName.replace('/alfresco-login.component.js', '');
+    baseComponentPath = __moduleName.replace('/alfresco-login.component.js', '');
 
     isPasswordShow: boolean = false;
 
@@ -148,9 +148,9 @@ export class AlfrescoLoginComponent {
     toggleShowPassword() {
         this.isPasswordShow = !this.isPasswordShow;
         if (this.isPasswordShow) {
-            (<HTMLInputElement>document.getElementById("password")).type = 'text'
+            (<HTMLInputElement>document.getElementById('password')).type = 'text';
         } else {
-            (<HTMLInputElement>document.getElementById("password")).type = 'password';
+            (<HTMLInputElement>document.getElementById('password')).type = 'password';
         }
     }
 
@@ -163,10 +163,6 @@ export class AlfrescoLoginComponent {
         if (typeof componentHandler !== 'undefined') {
             componentHandler.upgradeAllRegistered();
         }
-        if (field.valid) {
-            return false;
-        } else {
-            return true;
-        }
+        return !field.valid;
     }
 }