diff --git a/admin-ui/src/app/features/resources/machines/create/create.component.html b/admin-ui/src/app/features/resources/machines/create/create.component.html
index 8bf774a8..98d463af 100644
--- a/admin-ui/src/app/features/resources/machines/create/create.component.html
+++ b/admin-ui/src/app/features/resources/machines/create/create.component.html
@@ -109,10 +109,13 @@ <h3>{{ 'machines.header' | translate }}</h3>
 
                         <mat-form-field>
                           <input
+                            #keyboardRef
+                            #validity
                             matInput
                             [min]="minDate"
                             [matDatepicker]="picker"
                             formControlName="validity"
+                            (focus)="scrollPage(validity, 'primary', 'validity', 4)"
                             id="validity"
                             placeholder="{{ 'machines.validity' | translate }}"
                             required
@@ -161,7 +164,7 @@ <h3>{{ 'machines.header' | translate }}</h3>
                             <textarea
                             #keyboardRef
                             #publicKey
-                            (focus)="scrollPage(publicKey, 'primary', 'publicKey', 0)"
+                            (focus)="scrollPage(publicKey, 'primary', 'publicKey', 5)"
                             formControlName="publicKey"
                             id="publicKey"
                             matInput
@@ -184,7 +187,7 @@ <h3>{{ 'machines.header' | translate }}</h3>
                             <textarea
                             #keyboardRef
                             #signPublicKey
-                            (focus)="scrollPage(signPublicKey, 'primary', 'signPublicKey', 0)"
+                            (focus)="scrollPage(signPublicKey, 'primary', 'signPublicKey', 6)"
                             formControlName="signPublicKey"
                             id="signPublicKey"
                             matInput