diff --git a/jslib b/jslib
index 0217fdf7..747cd637 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 0217fdf7c1f402974e9ed80e216d84dffb88a696
+Subproject commit 747cd6373305042640f5f0d861eda0fdeb22cab7
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index 38858d85..f01cad79 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -7,13 +7,13 @@
                 <div class="card-body">
                     <div class="form-group">
                         <label for="email">{{'emailAddress' | i18n}}</label>
-                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required inputmode="email" appInputVerbatim="false">
                     </div>
                     <div class="form-group">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <div class="d-flex">
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
-                                [(ngModel)]="masterPassword" required>
+                                [(ngModel)]="masterPassword" required appInputVerbatim>
                             <button type="button" class="ml-1 btn btn-link" appBlurClick title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index c6a36c15..4901aa78 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -32,7 +32,6 @@ export class LoginComponent extends BaseLoginComponent {
                 this.email = qParams.email;
             }
             await super.ngOnInit();
-            document.getElementById(this.email == null || this.email === '' ? 'email' : 'masterPassword').focus();
         });
     }
 }