diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index d922cd97f85..c68117b55b6 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -419,7 +419,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/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 4983b0f0bed..eca2eb29d48 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -99,6 +99,7 @@ abstract class AccountFormController extends ContentEntityFormController {
         '#type' => 'password_confirm',
         '#size' => 25,
         '#description' => $this->t('To change the current user password, enter the new password in both fields.'),
+        '#pre_render' => array('user_form_pre_render_password_confirm'),
       );
 
       // To skip the current password field, the user must have logged in via a
@@ -146,6 +147,7 @@ abstract class AccountFormController extends ContentEntityFormController {
         '#type' => 'password_confirm',
         '#size' => 25,
         '#description' => $this->t('Provide a password for the new account in both fields.'),
+        '#pre_render' => array('user_form_pre_render_password_confirm'),
         '#required' => TRUE,
       );
     }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index f6a30cbde5d..f551063c517 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1699,13 +1699,10 @@ function _user_mail_notify($op, $account, $langcode = 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) {
   $password_settings = array(
     'confirmTitle' => t('Passwords match:'),
     'confirmSuccess' => t('yes'),