2 files changed, 4 insertions, 5 deletions

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 f1127b6a1..43facb7ed 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
@@ -4,7 +4,7 @@
 
   <label i18n for="current-password">Change password</label>
   <my-input-toggle-hidden formControlName="current-password"
-                          id="current-password"
+                          inputId="current-password"
                           i18n-placeholder placeholder="Current password"
                           [ngClass]="{ 'input-error': formErrors['current-password'] }"
                           autocomplete="current-password"></my-input-toggle-hidden>
@@ -13,7 +13,7 @@
   </div>
 
   <my-input-toggle-hidden formControlName="new-password"
-                          id="new-password"
+                          inputId="new-password"
                           i18n-placeholder placeholder="New password"
                           [ngClass]="{ 'input-error': formErrors['new-password'] }"
                           autocomplete="new-password"></my-input-toggle-hidden>
@@ -22,7 +22,7 @@
   </div>
 
   <my-input-toggle-hidden formControlName="new-confirmed-password"
-                          id="new-confirmed-password"
+                          inputId="new-confirmed-password"
                           i18n-placeholder placeholder="Confirm new password"
                           [ngClass]="{ 'input-error': formErrors['new-confirmed-password'] }"
                           autocomplete="new-password"></my-input-toggle-hidden>
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 0d1f3094a..4e3fda587 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
@@ -11,8 +11,7 @@ my-input-toggle-hidden {
   display: block;
 }
 
-#new-password,
-#new-confirmed-password  {
+my-input-toggle-hidden + my-input-toggle-hidden {
   margin-top: 15px;
 }