diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index 278bd8c48..ce3226857 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -115,6 +115,7 @@
 
         <div class="form-group" *ngIf="isCreation()">
           <label i18n for="password">Password</label>
+
           <my-help *ngIf="isPasswordOptional()">
             <ng-template ptTemplate="customHtml">
               <ng-container i18n>
diff --git a/client/src/app/shared/shared-main/misc/help.component.html b/client/src/app/shared/shared-main/misc/help.component.html
index 0252ad5cb..7f4ddfb80 100644
--- a/client/src/app/shared/shared-main/misc/help.component.html
+++ b/client/src/app/shared/shared-main/misc/help.component.html
@@ -32,6 +32,7 @@
   [autoClose]="autoClose"
   (onHidden)="onPopoverHidden()"
   (onShown)="onPopoverShown()"
+  type="button"
 >
   <my-global-icon [iconName]="iconName"></my-global-icon>
 </button>