diff --git a/guacamole/src/main/webapp/app/manage/styles/buttons.css b/guacamole/src/main/webapp/app/settings/styles/buttons.css
similarity index 100%
rename from guacamole/src/main/webapp/app/manage/styles/buttons.css
rename to guacamole/src/main/webapp/app/settings/styles/buttons.css
diff --git a/guacamole/src/main/webapp/app/settings/styles/settings.css b/guacamole/src/main/webapp/app/settings/styles/settings.css
index 961fdc5a0..67453a266 100644
--- a/guacamole/src/main/webapp/app/settings/styles/settings.css
+++ b/guacamole/src/main/webapp/app/settings/styles/settings.css
@@ -32,7 +32,7 @@
 
 .settings .action-buttons {
     text-align: center;
-    margin-bottom: 1em;
+    margin: 1em 0;
 }
 
 .settings-tabs .page-list {
diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
index 003b0bb74..0a5efd80f 100644
--- a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
+++ b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html
@@ -1,4 +1,4 @@
-<div class="settings section preferences">
+<div class="preferences">
     <!--
     Copyright 2015 Glyptodon LLC.
 
@@ -22,8 +22,8 @@
     -->
 
     <!-- Password update -->
-    <div class="update-password" ng-show="canChangePassword">
-        <h3>{{'SETTINGS_PREFERENCES.SECTION_HEADER_CHANGE_PASSWORD' | translate}}</h3>
+    <div class="settings section" ng-show="canChangePassword">
+        <p>{{'SETTINGS_PREFERENCES.HELP_UPDATE_PASSWORD' | translate}}</p>
 
         <!-- Password editor -->
         <div class="form">
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index 152c05bb7..b5a7a7173 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -417,9 +417,9 @@
         "FIELD_HEADER_PASSWORD_NEW_AGAIN" : "Confirm New Password:",
         "FIELD_HEADER_USERNAME"           : "Username:",
         
-        "INFO_PASSWORD_CHANGED" : "Password changed.",
+        "HELP_UPDATE_PASSWORD" : "If you wish to change your password, enter your current password and the desired new password below, and click \"Update Password\". The change will take effect immediately.",
 
-        "SECTION_HEADER_CHANGE_PASSWORD" : "Change Password"
+        "INFO_PASSWORD_CHANGED" : "Password changed."
 
     },