diff --git a/modules/user/user.module b/modules/user/user.module
index 1355159..1ee725d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1034,7 +1034,13 @@ function user_account_form(&$form, &$form_state) {
   // Display password field only for existing users or when user is allowed to
   // assign a password during registration.
   if (!$register) {
-    $form['account']['pass'] = array(
+    $form['account']['changepass'] = array(
+      '#type' => 'fieldset',
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+      '#title' => t('Change password'),
+    );
+    $form['account']['changepass']['pass'] = array(
       '#type' => 'password_confirm',
       '#size' => 25,
       '#description' => t('To change the current user password, enter the new password in both fields.'),