diff --git a/smp-angular/src/app/alert/alert-controller.ts b/smp-angular/src/app/alert/alert-controller.ts
index 6009413b48b295ff2db84889fcc5e0cd2c90d63e..c3078584a6d3b6ffb4f0716b2d7ae2c0d25573a1 100644
--- a/smp-angular/src/app/alert/alert-controller.ts
+++ b/smp-angular/src/app/alert/alert-controller.ts
@@ -33,7 +33,7 @@ export class AlertController implements SearchTableController {
   public showDetails(row: any) {
     this.dialog.open(ObjectPropertiesDialogComponent, {
       data: {
-        title: "Alert details!",
+        title: "Alert details",
         object: row.alertDetails,
 
       }
diff --git a/smp-angular/src/app/alert/alert.component.ts b/smp-angular/src/app/alert/alert.component.ts
index d1f58000c3334d669076f75eae52c71528f558e3..aab1e55702d41674d896e9524463a8bbdfc7b324 100644
--- a/smp-angular/src/app/alert/alert.component.ts
+++ b/smp-angular/src/app/alert/alert.component.ts
@@ -131,7 +131,7 @@ export class AlertComponent implements OnInit, AfterViewInit, AfterViewChecked {
   details(row: any) {
     this.dialog.open(ObjectPropertiesDialogComponent, {
       data: {
-        title: "Alert details!",
+        title: "Alert details",
         object: row.alertDetails,
 
       }
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 3794e363ffca4b49ec98761623c86801807a4ed8..45614761129c1de2c1342d8fa3ba706637615580 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
@@ -114,7 +114,6 @@ export class PasswordChangeDialogComponent {
         this.dialogForm.controls['new-password'].value,
         this.dialogForm.controls['current-password'].value).subscribe((res: boolean) => {
           this.showPassChangeDialog();
-          close()
         },
         (err) => {
           this.showErrorMessage(err.error.errorDescription);
@@ -126,7 +125,7 @@ export class PasswordChangeDialogComponent {
   showPassChangeDialog() {
     this.dialog.open(InformationDialogComponent, {
       data: {
-        title: "Password set/changed!",
+        title: "Password set/changed",
         description: "Password has been successfully set/changed." +
           (!this.adminUser ? " Login again to the application with the new password!" : "")
       }
diff --git a/smp-angular/src/app/domain/domain.component.ts b/smp-angular/src/app/domain/domain.component.ts
index 8b4e34f9902b7e35027382a01add20849ee8926e..152b8475c95aea43b6e9f2f65a9d30584157bc4a 100644
--- a/smp-angular/src/app/domain/domain.component.ts
+++ b/smp-angular/src/app/domain/domain.component.ts
@@ -242,7 +242,7 @@ export class DomainComponent implements OnInit, AfterViewInit, AfterViewChecked
 
     this.dialog.open(ConfirmationDialogComponent, {
       data: {
-        title: "Unregister domain to SML!",
+        title: "Unregister domain to SML",
         description: "Action will unregister domain: " + domainRo.domainCode + " and all its service groups from SML. Do you wish to continue?"
       }
     }).afterClosed().subscribe(result => {
@@ -261,7 +261,7 @@ export class DomainComponent implements OnInit, AfterViewInit, AfterViewChecked
 
     this.dialog.open(ConfirmationDialogComponent, {
       data: {
-        title: "Register domain to SML!",
+        title: "Register domain to SML",
         description: "Action will register domain: " + domainRo.domainCode + " and all its service groups to SML. Do you wish to continue?"
       }
     }).afterClosed().subscribe(result => {
diff --git a/smp-angular/src/app/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts b/smp-angular/src/app/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts
index 100eb78437e811ca627b539159cb2b4b854f7dc7..8950dd1ea60752b4259df11c4a425b677e855747 100644
--- a/smp-angular/src/app/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts
+++ b/smp-angular/src/app/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts
@@ -52,7 +52,7 @@ export class KeystoreEditDialogComponent implements AfterViewChecked{
     if (listSignatureKeys.length > 0) {
       this.dialog.open(InformationDialogComponent, {
         data: {
-          title: "Delete key/certificate " + row.alias + " from keystore!",
+          title: "Delete key/certificate " + row.alias + " from keystore",
           description: "Key/certificate is in use by domains: " + listSignatureKeys + ". First replace/remove certificate from domains!"
         }
       }).afterClosed().subscribe(result => {
@@ -63,7 +63,7 @@ export class KeystoreEditDialogComponent implements AfterViewChecked{
     } else {
       this.dialog.open(ConfirmationDialogComponent, {
         data: {
-          title: "Delete key/certificate " + row.alias + " from keystore!",
+          title: "Delete key/certificate " + row.alias + " from keystore",
           description: "Action will permanently delete key/certificate from keystore! Do you wish to continue?"
         }
       }).afterClosed().subscribe(result => {
diff --git a/smp-angular/src/app/login/login.component.ts b/smp-angular/src/app/login/login.component.ts
index 929b22a41b5d164d7efcd6cd8a5619db5d76595c..265e5729bea37114475381b8ff8cc44250e9cb45 100644
--- a/smp-angular/src/app/login/login.component.ts
+++ b/smp-angular/src/app/login/login.component.ts
@@ -105,7 +105,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   showWarningBeforeExpire(user: User) {
     this.dialog.open(InformationDialogComponent, {
       data: {
-        title: "Warning! Your password is about to expire!",
+        title: "Warning! Your password is about to expire",
         description: "Your password is about to expire on " + formatDate(user.passwordExpireOn,"longDate","en-US")+"! Please change the password before the expiration date!"
       }
     }).afterClosed().subscribe(() => this.router.navigate([this.returnUrl]));
diff --git a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
index 3b629142491e6a2a7e706fc56bd5effe7b594aab..84580daf0630a2688662bd6527b1fa41854b6941 100644
--- a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
+++ b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
@@ -321,7 +321,7 @@ export class ServiceGroupDetailsDialogComponent implements OnInit {
       if (smdCount > 0) {
         this.dialog.open(ConfirmationDialogComponent, {
           data: {
-            title: "Registered serviceMetadata on domain!",
+            title: "Registered serviceMetadata on domain",
             description: "Unregistering service group from domain will also delete its serviceMetadata (count: " + smdCount + ") from the domain! Do you want to continue?"
           }
         }).afterClosed().subscribe(result => {
diff --git a/smp-angular/src/app/user/truststore-edit-dialog/truststore-edit-dialog.component.ts b/smp-angular/src/app/user/truststore-edit-dialog/truststore-edit-dialog.component.ts
index 766444d409797dae5c6e652f279ebb6d1134690e..4c585acd1cb56b5c3fbbe55710507f09484e1042 100644
--- a/smp-angular/src/app/user/truststore-edit-dialog/truststore-edit-dialog.component.ts
+++ b/smp-angular/src/app/user/truststore-edit-dialog/truststore-edit-dialog.component.ts
@@ -101,7 +101,7 @@ export class TruststoreEditDialogComponent implements AfterViewInit, AfterViewCh
   onDeleteCertificateRowActionClicked(row) {
     this.dialog.open(ConfirmationDialogComponent, {
       data: {
-        title: "Delete certificate " + row.alias + " from truststore!",
+        title: "Delete certificate " + row.alias + " from truststore",
         description: "Action will permanently delete certificate from truststore! Do you wish to continue?"
       }
     }).afterClosed().subscribe(result => {