6 files changed, 38 insertions, 32 deletions

diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
index ce176d682..29823bdec 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html
@@ -12,9 +12,8 @@
 <form role="form" class="change-email" (ngSubmit)="changeEmail()" [formGroup]="form" *ngIf="user.pluginAuth === null">
 
   <div class="form-group">
-    <label i18n for="new-email">New email</label>
     <input
-      type="email" id="new-email" i18n-placeholder placeholder="Your new email" class="form-control"
+      type="email" id="new-email" i18n-placeholder placeholder="New email" class="form-control"
       formControlName="new-email" [ngClass]="{ 'input-error': formErrors['new-email'] }"
     >
     <div *ngIf="formErrors['new-email']" class="form-error">
@@ -23,11 +22,11 @@
   </div>
 
   <div class="form-group">
-    <label i18n for="new-email">Your current password</label>
-    <input
-      type="password" id="password" i18n-placeholder placeholder="Your password" autocomplete="off"
-      formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }" class="form-control"
-    >
+    <my-input-toggle-hidden formControlName="password"
+                            id="password"
+                            i18n-placeholder placeholder="Current password"
+                            [ngClass]="{ 'input-error': formErrors['password'] }"
+                            autocomplete="current-password"></my-input-toggle-hidden>
     <div *ngIf="formErrors['password']" class="form-error">
       {{ formErrors['password'] }}
     </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss
index aec709ea0..a8b9be0d1 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss
@@ -6,7 +6,11 @@ label {
   font-size: 100%;
 }
 
-input[type=password],
+my-input-toggle-hidden {
+  width: 340px;
+  display: block;
+}
+
 input[type=email] {
   @include peertube-input-text(340px);
 
@@ -20,10 +24,13 @@ input[type=submit] {
 
 .current-email,
 .pending-email {
-  font-size: 16px;
   margin-bottom: 15px;
 
   .email {
     font-weight: $font-semibold;
   }
 }
+
+.form-group {
+  width: max-content;
+}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
index 4756cfecd..f1127b6a1 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
@@ -3,26 +3,29 @@
 <form role="form" (ngSubmit)="changePassword()" [formGroup]="form">
 
   <label i18n for="current-password">Change password</label>
-  <input
-    type="password" id="current-password" i18n-placeholder placeholder="Current password" autocomplete="current-password"
-    formControlName="current-password" [ngClass]="{ 'input-error': formErrors['current-password'] }" class="form-control"
-  >
+  <my-input-toggle-hidden formControlName="current-password"
+                          id="current-password"
+                          i18n-placeholder placeholder="Current password"
+                          [ngClass]="{ 'input-error': formErrors['current-password'] }"
+                          autocomplete="current-password"></my-input-toggle-hidden>
   <div *ngIf="formErrors['current-password']" class="form-error">
     {{ formErrors['current-password'] }}
   </div>
 
-  <input
-    type="password" id="new-password" i18n-placeholder placeholder="New password" autocomplete="new-password"
-    formControlName="new-password" [ngClass]="{ 'input-error': formErrors['new-password'] }" class="form-control"
-  >
+  <my-input-toggle-hidden formControlName="new-password"
+                          id="new-password"
+                          i18n-placeholder placeholder="New password"
+                          [ngClass]="{ 'input-error': formErrors['new-password'] }"
+                          autocomplete="new-password"></my-input-toggle-hidden>
   <div *ngIf="formErrors['new-password']" class="form-error">
     {{ formErrors['new-password'] }}
   </div>
 
-  <input
-    type="password" id="new-confirmed-password" i18n-placeholder placeholder="Confirm new password" autocomplete="new-password"
-    formControlName="new-confirmed-password" class="form-control"
-  >
+  <my-input-toggle-hidden formControlName="new-confirmed-password"
+                          id="new-confirmed-password"
+                          i18n-placeholder placeholder="Confirm new password"
+                          [ngClass]="{ 'input-error': formErrors['new-confirmed-password'] }"
+                          autocomplete="new-password"></my-input-toggle-hidden>
   <div *ngIf="formErrors['new-confirmed-password']" class="form-error">
     {{ formErrors['new-confirmed-password'] }}
   </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
index 381afae07..0d1f3094a 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
@@ -6,14 +6,14 @@ label {
   font-size: 100%;
 }
 
-input[type=password] {
-  @include peertube-input-text(340px);
+my-input-toggle-hidden {
+  width: 340px;
   display: block;
+}
 
-  &#new-password,
-  &#new-confirmed-password  {
-    margin-top: 15px;
-  }
+#new-password,
+#new-confirmed-password  {
+  margin-top: 15px;
 }
 
 input[type=submit] {
@@ -22,4 +22,3 @@ input[type=submit] {
 
   margin-top: 15px;
 }
-
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
index ba68bab32..e034aedef 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -1,7 +1,7 @@
 import { filter } from 'rxjs/operators'
 import { Component, OnInit } from '@angular/core'
 import { AuthService, Notifier, UserService } from '@app/core'
-import { USER_CONFIRM_PASSWORD_VALIDATOR, USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators'
+import { USER_CONFIRM_PASSWORD_VALIDATOR, USER_PASSWORD_VALIDATOR, USER_EXISTING_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators'
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { User } from '@shared/models'
 
@@ -25,7 +25,7 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
 
   ngOnInit () {
     this.buildForm({
-      'current-password': USER_PASSWORD_VALIDATOR,
+      'current-password': USER_EXISTING_PASSWORD_VALIDATOR,
       'new-password': USER_PASSWORD_VALIDATOR,
       'new-confirmed-password': USER_CONFIRM_PASSWORD_VALIDATOR
     })
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
index fe78a57a4..d79ff690b 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
@@ -2,8 +2,6 @@
 @import '_mixins';
 
 .delete-me {
-  font-size: 15px;
-
   button {
     @include peertube-button;
     @include danger-button;