2 files changed, 5 insertions, 2 deletions

diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.ts b/client/src/app/+admin/overview/users/user-edit/user-edit.ts
index 21e9629ab..5428f6ce9 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.ts
@@ -62,7 +62,8 @@ export abstract class UserEdit extends FormReactive implements OnInit {
 
   displayDangerZone () {
     if (this.isCreation()) return false
-    if (this.user?.pluginAuth) return false
+    if (!this.user) return false
+    if (this.user.pluginAuth) return false
     if (this.auth.getUser().id === this.user.id) return false
 
     return true
diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.html b/client/src/app/+admin/overview/users/user-edit/user-password.component.html
index 13f57024b..173825957 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-password.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.html
@@ -1,8 +1,10 @@
 <form role="form" (ngSubmit)="formValidated()" [formGroup]="form">
 
   <div class="input-group">
-    <input id="password" [attr.type]="showPassword ? 'text' : 'password'" class="form-control"
+    <input id="password"
+      [attr.type]="showPassword ? 'text' : 'password'" class="form-control"
       formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
+      autocomplete="new-password"
     >
     <button class="btn btn-sm btn-outline-secondary" (click)="togglePasswordVisibility()" type="button">
       <ng-container *ngIf="!showPassword" i18n>Show</ng-container>