diff --git a/web/styles/settings.css b/web/styles/settings.css
index 09f0cce946..1ea2d682ca 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -180,7 +180,8 @@ h3,
     }
 }
 
-#change_email_button {
+#change_email_button,
+#change_password {
     min-width: 0;
 }
 
diff --git a/web/templates/settings/account_settings.hbs b/web/templates/settings/account_settings.hbs
index 1a6df06c33..688632abc1 100644
--- a/web/templates/settings/account_settings.hbs
+++ b/web/templates/settings/account_settings.hbs
@@ -43,9 +43,9 @@
                 <form class="password-change-form grid">
                     {{#if user_can_change_password}}
                     <div>
-                        <label class="inline-block title">{{t "Password" }}</label>
-                        <div class="input-group inline-block">
-                            <button id="change_password" type="button" class="btn-link small button rounded inline-block" data-dismiss="modal">********<i class="fa fa-pencil"></i></button>
+                        <label class="settings-field-label">{{t "Password" }}</label>
+                        <div class="input-group">
+                            <button id="change_password" type="button" class="button rounded" data-dismiss="modal">{{t "Change your password" }}</button>
                         </div>
                     </div>
                     {{/if}}