diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index e0529df..b2ec492 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -390,7 +390,7 @@ function system_element_info() {
   );
   $types['password_confirm'] = array(
     '#input' => TRUE,
-    '#process' => array('form_process_password_confirm', 'user_form_process_password_confirm'),
+    '#process' => array('form_process_password_confirm'),
     '#theme_wrappers' => array('form_element'),
   );
   $types['textarea'] = array(
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 2dded35..252d1cc 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -977,6 +977,7 @@ function user_account_form(&$form, &$form_state) {
     $form['account']['pass'] = array(
       '#type' => 'password_confirm',
       '#size' => 25,
+      '#pre_render' => array('user_form_pre_render_password_confirm'),
       '#description' => t('To change the current user password, enter the new password in both fields.'),
     );
     // To skip the current password field, the user must have logged in via a
@@ -1016,6 +1017,7 @@ function user_account_form(&$form, &$form_state) {
       '#size' => 25,
       '#description' => t('Provide a password for the new account in both fields.'),
       '#required' => TRUE,
+      '#pre_render' => array('user_form_pre_render_password_confirm')
     );
   }
 
@@ -3492,13 +3494,10 @@ function _user_mail_notify($op, $account, $language = NULL) {
 /**
  * Form element process handler for client-side password validation.
  *
- * This #process handler is automatically invoked for 'password_confirm' form
- * elements to add the JavaScript and string translations for dynamic password
- * validation.
- *
- * @see system_element_info()
+ * This #pre_render handler is added to the user registration form to add the
+ * JavaScript and string translations for dynamic password validation.
  */
-function user_form_process_password_confirm($element) {
+function user_form_pre_render_password_confirm($element) {
   global $user;
 
   $js_settings = array(