diff --git a/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.html b/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.html
index 0e7a156e3284294bdd8677eeb8229d36395f53d0..a6c28f91b7dc05b63507897c7890bf4c032655df 100644
--- a/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.html
+++ b/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.html
@@ -20,6 +20,14 @@
     </mat-card>
     <mat-card>
       <mat-card-content>
+        <mat-form-field *ngIf="!securityService.getCurrentUser()?.casAuthenticated" style="width:100%">
+          <input matInput [placeholder]="getPasswordTitle" [type]="hideCurrPwdFiled ? 'password' : 'text'"
+                 formControlName="current-password" required id="cp_id">
+          <mat-icon matSuffix
+                    (click)="hideCurrPwdFiled = !hideCurrPwdFiled">{{hideCurrPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
+          <mat-error *ngIf="passwordError('current-password', 'required')">Password is required</mat-error>
+        </mat-form-field>
+
         <mat-card-actions>
           <button mat-raised-button color="primary" (click)="regenerateAccessToken()"
                   [disabled]="!dialogForm.valid">
@@ -30,13 +38,6 @@
             Token will be generated immediately.
           </mat-label>
         </mat-card-actions>
-        <mat-form-field *ngIf="!securityService.getCurrentUser()?.casAuthenticated" style="width:100%">
-          <input matInput [placeholder]="getPasswordTitle" [type]="hideCurrPwdFiled ? 'password' : 'text'"
-                 formControlName="current-password" required id="cp_id">
-          <mat-icon matSuffix
-                    (click)="hideCurrPwdFiled = !hideCurrPwdFiled">{{hideCurrPwdFiled ? 'visibility_off' : 'visibility'}}</mat-icon>
-          <mat-error *ngIf="passwordError('current-password', 'required')">Password is required</mat-error>
-        </mat-form-field>
 
         <mat-form-field style="width:100%">
           <input matInput placeholder="Access token id" formControlName="accessTokenId" id="at_id" readonly="true">
diff --git a/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.ts b/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.ts
index 121d836f8b0e490bd0518953ed450dbbea371de5..cf5540f536a8d69e5373e8b0d4d5f9e6778bd443 100644
--- a/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.ts
+++ b/smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.ts
@@ -17,7 +17,7 @@ import {SearchTableEntityStatus} from "../../search-table/search-table-entity-st
 export class AccessTokenGenerationDialogComponent {
 
   dateTimeFormat: string = SmpConstants.DATE_TIME_FORMAT;
-  formTitle = "Access token generation dialog!";
+  formTitle = "Access token generation dialog";
   dialogForm: FormGroup;
   hideCurrPwdFiled: boolean = true;
   hideNewPwdFiled: boolean = true;