diff --git a/ui/src/app/shared/alert/alert.component.html b/ui/src/app/shared/alert/alert.component.html
index d513758ca..923929e0a 100644
--- a/ui/src/app/shared/alert/alert.component.html
+++ b/ui/src/app/shared/alert/alert.component.html
@@ -3,7 +3,14 @@
     <ngb-alert *ngIf="alert && alert.type && alert.msg" [type]="alert.type" [dismissible]="false" class="alert-success">
       <div class="d-flex">
         <div class="font-size-16 flex-grow-1">{{ alert.msg | localize }}</div>
-        <a (click)="close(alert)" (keyup)="closeOldestAlert()" tabindex="0" class="close">×</a>
+        <a
+          (click)="close(alert)"
+          (keyup.esc)="closeOldestAlert()"
+          (keyup.enter)="closeOldestAlert()"
+          tabindex="0"
+          class="close"
+          >×</a
+        >
       </div>
     </ngb-alert>
   </div>
diff --git a/ui/src/app/user/user-detail.component.html b/ui/src/app/user/user-detail.component.html
index 4185a2a59..e8c06f390 100644
--- a/ui/src/app/user/user-detail.component.html
+++ b/ui/src/app/user/user-detail.component.html
@@ -1,7 +1,7 @@
 <div class="row justify-content-center">
   <div class="col-8">
     <div *ngIf="user">
-      <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">User Settings</h1>
+      <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">User details</h1>
       <hr />
       <app-error-alert></app-error-alert>
       <div class="row">
@@ -104,7 +104,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">Use
         </button>
         <button *ngIf="!user.activated" type="button" (click)="sendActivate()" class="btn btn-primary btn-sm ml-1">
           <fa-icon [icon]="faCheckCircle"></fa-icon>
-          <span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Activate</span>
+          <span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Resend activation email</span>
         </button>
       </div>
     </div>
diff --git a/ui/src/app/user/user-update.component.html b/ui/src/app/user/user-update.component.html
index dbec338b9..ece29576d 100644
--- a/ui/src/app/user/user-update.component.html
+++ b/ui/src/app/user/user-update.component.html
@@ -2,7 +2,7 @@
   <div class="col-8">
     <form name="editForm" role="form" novalidate [formGroup]="editForm">
       <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.home.createOrEditLabel.string">
-        Create or edit a User Settings
+        Add or edit user
       </h1>
       <div>
         <app-alert></app-alert>
@@ -11,13 +11,21 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
             class="alert alert-danger alert-dismissible"
             role="alert"
             ng-reflect-type="danger"
-            (close)="validation.errors = null"
+            [dismissible]="false"
           >
             <ul class="validation-errors">
               <li *ngFor="let error of validation.errors">
                 {{ error }}
               </li>
             </ul>
+            <a
+              (click)="validation.errors = null"
+              (keyup.esc)="validation.errors = null"
+              (keyup.enter)="validation.errors = null"
+              tabindex="0"
+              class="close"
+              >×</a
+            >
           </ngb-alert>
         </div>
         <div class="form-group">
diff --git a/ui/src/app/user/users.component.html b/ui/src/app/user/users.component.html
index a535ec3ec..ab892eed9 100644
--- a/ui/src/app/user/users.component.html
+++ b/ui/src/app/user/users.component.html
@@ -175,7 +175,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
                 class="btn btn-primary btn-sm ml-1"
               >
                 <fa-icon [icon]="faCheckCircle"></fa-icon>
-                <span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Activate</span>
+                <span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Resend activation email</span>
               </button>
               <button
                 type="submit"