diff --git a/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.html b/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.html
index a238df605fe69fae26172692d34f29623d83e29f..14e31cac0bad1858765d1bb6d7e6c148ce6334ae 100644
--- a/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.html
+++ b/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.html
@@ -61,7 +61,7 @@
   <button mat-raised-button color="primary" (click)="changeCurrentUserPassword()"
           [disabled]="!dialogForm.valid ">
     <mat-icon>check_circle</mat-icon>
-    <span>Change password</span>
+    <span>Set/change password</span>
   </button>
   <button *ngIf="!this.forceChange" mat-raised-button color="primary" mat-dialog-close>
     <mat-icon>cancel</mat-icon>
diff --git a/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.ts b/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.ts
index c28cd854a92d4d4c94501c20010678a0c997c14a..11c061a39d18acf289d9cccdcc98096126d3de6c 100644
--- a/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.ts
+++ b/smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.ts
@@ -16,7 +16,7 @@ import {UserRo} from "../../../user/user-ro.model";
 })
 export class PasswordChangeDialogComponent {
 
-  formTitle = "Change password dialog";
+  formTitle = "Set/Change password dialog";
   dialogForm: FormGroup;
   hideCurrPwdFiled: boolean = true;
   hideNewPwdFiled: boolean = true;
@@ -121,9 +121,9 @@ export class PasswordChangeDialogComponent {
   showPassChangeDialog() {
     this.dialog.open(InformationDialogComponent, {
       data: {
-        title: "Password changed!",
-        description: "Password has been successfully changed. " +
-          (!this.adminUser ? "Login again to the application with the new password!" : "")
+        title: "Password set/changed!",
+        description: "Password has been successfully set/changed." +
+          (!this.adminUser ? " Login again to the application with the new password!" : "")
       }
     }).afterClosed().subscribe(result => {
       if (!this.adminUser) {
diff --git a/smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.html b/smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.html
index 422ca26024601cc6628f4bf019b2048971c2634d..7da5985489d64d889bafcb5168ae8863b79f2c14 100644
--- a/smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.html
+++ b/smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.html
@@ -70,8 +70,8 @@
             </mat-form-field>
           </div>
           <button mat-flat-button color="primary" style="width: 100%" id="changePassword_id"
-                  (click)="changeCurrentUserPassword()">
-            <span>Change password</span>
+                  (click)="changeCurrentUserPassword()" [disabled]="!editMode">
+            <span>Set/change password</span>
           </button>
         </fieldset>
       </mat-card-content>
@@ -112,7 +112,7 @@
                      maxlength="255" disabled>
             </mat-form-field>
           </div>
-          <button mat-flat-button color="primary" style="width: 100%" (click)="regenerateAccessToken()">
+          <button mat-flat-button color="primary" style="width: 100%" [disabled]="!editMode" (click)="regenerateAccessToken()">
             <span>Regenerate access token</span>
           </button>
         </fieldset>