diff --git a/angular/src/app/presentation-options/default-option/pages/login/login.component.ts b/angular/src/app/presentation-options/default-option/pages/login/login.component.ts
index 0895123..22b5087 100644
--- a/angular/src/app/presentation-options/default-option/pages/login/login.component.ts
+++ b/angular/src/app/presentation-options/default-option/pages/login/login.component.ts
@@ -53,14 +53,14 @@ export class LoginComponent implements OnInit, AfterViewInit {
   @ViewChild('field2', { static: false }) field2!: ElementRef;
   @ViewChild('field3', { static: false }) field3!: ElementRef;
 
-  @HostListener('window:keydown', ['$event'])
+  @HostListener('window:input', ['$event'])
   HandlKeyEvents(event: any) {
-    if (!event.target.classList.contains('field')) return;
-    const key = event.key.toLocaleLowerCase();
+    if (!event.target.classList.contains('field')) return;			
+    const key = event.data
     let elementId = '';
 
     switch (key) {
-      case 'backspace':
+      case null:
         elementId = event.target.id;
         event.target.value = '';
         const prevInputIndex = this.inputIds.indexOf(elementId) - 1;
@@ -93,15 +93,19 @@ export class LoginComponent implements OnInit, AfterViewInit {
       switch (i) {
         case 0:
           this.field.nativeElement.focus();
+					this.field.nativeElement.click();
           break;
         case 1:
           this.field1.nativeElement.focus();
+					this.field1.nativeElement.click();
           break;
         case 2:
           this.field2.nativeElement.focus();
+					this.field2.nativeElement.click();
           break;
         case 3:
           this.field3.nativeElement.focus();
+					this.field3.nativeElement.click();
           break;
       }
     }, 0);
@@ -155,7 +159,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
   }
 
   submitCode() {
-    const data = this.codeForm.value;
+    const data = this.codeForm.value;		
     this.jsonrpc
       .rpc(
         {