diff --git a/jslib b/jslib
index bded5eb625..747cd63733 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit bded5eb625e3eb8f7577ad3da54d5c3b7e543eb0
+Subproject commit 747cd6373305042640f5f0d861eda0fdeb22cab7
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index e97d35d3e0..84b852bb56 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -19,14 +19,13 @@
                 <div class="box-content-row" appBoxRow>
                     <label for="email">{{'emailAddress' | i18n}}</label>
                     <input id="email" type="text" name="Email" [(ngModel)]="email" required
-                           [appAutofocus]="email === ''" inputmode="email" appInputVerbatim="false">
+                           inputmode="email" appInputVerbatim="false">
                 </div>
                 <div class="box-content-row box-content-row-flex" appBoxRow>
                     <div class="row-main">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
-                               class="monospaced" [(ngModel)]="masterPassword" required [appAutofocus]="email !== ''"
-                               appInputVerbatim>
+                               class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim>
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick appBlurClick
diff --git a/src/popup/accounts/login.component.ts b/src/popup/accounts/login.component.ts
index a02f3448b5..b84e6ba588 100644
--- a/src/popup/accounts/login.component.ts
+++ b/src/popup/accounts/login.component.ts
@@ -6,6 +6,7 @@ import { Angulartics2 } from 'angulartics2';
 
 import { AuthService } from 'jslib/abstractions/auth.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
+import { StorageService } from 'jslib/abstractions/storage.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 
 import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
@@ -17,8 +18,8 @@ import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/l
 export class LoginComponent extends BaseLoginComponent {
     constructor(authService: AuthService, router: Router,
         analytics: Angulartics2, toasterService: ToasterService,
-        i18nService: I18nService, private syncService: SyncService) {
-        super(authService, router, analytics, toasterService, i18nService);
+        i18nService: I18nService, private syncService: SyncService, storageService: StorageService) {
+        super(authService, router, analytics, toasterService, i18nService, storageService);
         super.onSuccessfullLogin = () => {
             return syncService.fullSync(true);
         };