diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index 6944ec435..3ce246771 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -82,10 +82,12 @@
   <input type="submit" value="{{ getFormButtonTitle() }}" [disabled]="!form.valid">
 </form>
 
+<div *ngIf="!isCreation()">
   <div class="account-title" i18n>Danger Zone</div>
 
-<p i18n>Send a link to reset the password by mail to the user.</p>
-<button (click)="resetPassword()" i18n>Ask for new password</button>
+  <p i18n>Send a link to reset the password by mail to the user.</p>
+  <button style="margin-top:0;" (click)="resetPassword()" i18n>Ask for new password</button>
 
-<p class="mt-4" i18n>Manually set the user password</p>
-<my-user-password userId="userId"></my-user-password>
+  <p class="mt-4" i18n>Manually set the user password</p>
+  <my-user-password userId="userId"></my-user-password>
+</div>
\ No newline at end of file
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.html b/client/src/app/+admin/users/user-edit/user-password.component.html
index 267422bdd..822e4688e 100644
--- a/client/src/app/+admin/users/user-edit/user-password.component.html
+++ b/client/src/app/+admin/users/user-edit/user-password.component.html
@@ -1,4 +1,4 @@
-<form role="form" (ngSubmit)="formValidated()" [formGroup]="form">  
+<form role="form" (ngSubmit)="formValidated()" [formGroup]="form">
   <div class="form-group">
 
     <div class="input-group mb-3">
@@ -12,7 +12,7 @@
         formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
       >
       <div class="input-group-append">
-        <button class="btn btn-sm btn-outline-secondary" (click)="generatePassword()  " 
+        <button class="btn btn-sm btn-outline-secondary" (click)="generatePassword()  "
                 type="button">Generate</button>
       </div>
     </div>
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.ts b/client/src/app/+admin/users/user-edit/user-password.component.ts
index 99c4c8a59..30cd21ccd 100644
--- a/client/src/app/+admin/users/user-edit/user-password.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-password.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnDestroy, OnInit, Input } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Subscription } from 'rxjs'
 import * as generator from 'generate-password-browser'
 import { NotificationsService } from 'angular2-notifications'
 import { UserService } from '@app/shared/users/user.service'
@@ -24,8 +23,6 @@ export class UserPasswordComponent extends FormReactive implements OnInit, OnDes
 
   @Input() userId: number
 
-  private paramsSub: Subscription
-
   constructor (
     protected formValidatorService: FormValidatorService,
     protected serverService: ServerService,
@@ -47,7 +44,7 @@ export class UserPasswordComponent extends FormReactive implements OnInit, OnDes
   }
 
   ngOnDestroy () {
-    this.paramsSub.unsubscribe()
+    //
   }
 
   formValidated () {