only in patch2:
unchanged:
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -261,7 +261,7 @@ function user_admin_account_validate($form, &$form_state) {
  * @see user_admin_settings_submit()
  */
 function user_admin_settings($form, &$form_state) {
-  $config = config('user.settings');
+  $form['#config'] = config('user.settings');
   // Settings for anonymous users.
   $form['anonymous_settings'] = array(
     '#type' => 'fieldset',
@@ -270,7 +270,8 @@ function user_admin_settings($form, &$form_state) {
   $form['anonymous_settings']['anonymous'] = array(
     '#type' => 'textfield',
     '#title' => t('Name'),
-    '#default_value' => $config->get('anonymous'),
+    '#load' => 'config',
+    '#config_key' => 'anonymous',
     '#description' => t('The name used to indicate anonymous users.'),
     '#required' => TRUE,
   );
@@ -291,7 +292,8 @@ function user_admin_settings($form, &$form_state) {
   $form['admin_role']['user_admin_role'] = array(
     '#type' => 'select',
     '#title' => t('Administrator role'),
-    '#default_value' => $config->get('admin_role'),
+    '#load' => 'config',
+    '#config_key' => 'admin_role',
     '#options' => $roles,
     '#description' => t('This role will be automatically assigned new permissions whenever a module is enabled. Changing this setting will not affect existing permissions.'),
   );
@@ -304,7 +306,8 @@ function user_admin_settings($form, &$form_state) {
   $form['registration_cancellation']['user_register'] = array(
     '#type' => 'radios',
     '#title' => t('Who can register accounts?'),
-    '#default_value' => $config->get('register'),
+    '#load' => 'config',
+    '#config_key' => 'register',
     '#options' => array(
       USER_REGISTER_ADMINISTRATORS_ONLY => t('Administrators only'),
       USER_REGISTER_VISITORS => t('Visitors'),
@@ -314,7 +317,8 @@ function user_admin_settings($form, &$form_state) {
   $form['registration_cancellation']['user_email_verification'] = array(
     '#type' => 'checkbox',
     '#title' => t('Require e-mail verification when a visitor creates an account.'),
-    '#default_value' => $config->get('verify_mail'),
+    '#load' => 'config',
+    '#config_key' => 'verify_mail',
     '#description' => t('New users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With this setting disabled, users will be logged in immediately upon registering, and may select their own passwords during registration.')
   );
   module_load_include('inc', 'user', 'user.pages');
@@ -344,7 +348,8 @@ function user_admin_settings($form, &$form_state) {
   $form['personalization']['user_signatures'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable signatures.'),
-    '#default_value' => $config->get('signatures'),
+    '#load' => 'config',
+    '#config_key' => 'signatures',
   );
   // If picture support is enabled, check whether the picture directory exists.
   if (variable_get('user_pictures', 0)) {
@@ -434,7 +439,7 @@ function user_admin_settings($form, &$form_state) {
     '#type' => 'fieldset',
     '#title' => t('Welcome (new user created by administrator)'),
     '#collapsible' => TRUE,
-    '#collapsed' => ($config->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY),
+    '#collapsed' => ($form['#config']->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY),
     '#description' => t('Edit the welcome e-mail messages sent to new member accounts created by an administrator.') . ' ' . $email_token_help,
     '#group' => 'email',
   );
@@ -455,7 +460,7 @@ function user_admin_settings($form, &$form_state) {
     '#type' => 'fieldset',
     '#title' => t('Welcome (awaiting approval)'),
     '#collapsible' => TRUE,
-    '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
+    '#collapsed' => ($form['#config']->get('register') != USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL),
     '#description' => t('Edit the welcome e-mail messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
     '#group' => 'email',
   );
@@ -476,7 +481,7 @@ function user_admin_settings($form, &$form_state) {
     '#type' => 'fieldset',
     '#title' => t('Welcome (no approval required)'),
     '#collapsible' => TRUE,
-    '#collapsed' => ($config->get('register') != USER_REGISTER_VISITORS),
+    '#collapsed' => ($form['#config']->get('register') != USER_REGISTER_VISITORS),
     '#description' => t('Edit the welcome e-mail messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help,
     '#group' => 'email',
   );
@@ -526,7 +531,8 @@ function user_admin_settings($form, &$form_state) {
   $form['email_activated']['user_mail_status_activated_notify'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is activated.'),
-    '#default_value' => $config->get('notify.status_activated'),
+    '#load' => 'config',
+    '#config_key' => 'notify.status_activated',
   );
   $form['email_activated']['settings'] = array(
     '#type' => 'container',
@@ -561,7 +567,8 @@ function user_admin_settings($form, &$form_state) {
   $form['email_blocked']['user_mail_status_blocked_notify'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is blocked.'),
-    '#default_value' => $config->get('notify.status_blocked'),
+    '#load' => 'config',
+    '#config_key' => 'notify.status_blocked',
   );
   $form['email_blocked']['settings'] = array(
     '#type' => 'container',
@@ -617,7 +624,8 @@ function user_admin_settings($form, &$form_state) {
   $form['email_canceled']['user_mail_status_canceled_notify'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is canceled.'),
-    '#default_value' => $config->get('notify.status_canceled'),
+    '#load' => 'config',
+    '#config_key' => 'notify.status_canceled',
   );
   $form['email_canceled']['settings'] = array(
     '#type' => 'container',
@@ -645,22 +653,6 @@ function user_admin_settings($form, &$form_state) {
 }
 
 /**
- * Form submission handler for user_admin_settings().
- */
-function user_admin_settings_submit($form, &$form_state) {
-  config('user.settings')
-    ->set('anonymous', $form_state['values']['anonymous'])
-    ->set('admin_role', $form_state['values']['user_admin_role'])
-    ->set('register', $form_state['values']['user_register'])
-    ->set('verify_mail', $form_state['values']['user_email_verification'])
-    ->set('signatures', $form_state['values']['user_signatures'])
-    ->set('notify.status_activated', $form_state['values']['user_mail_status_activated_notify'])
-    ->set('notify.status_blocked', $form_state['values']['user_mail_status_blocked_notify'])
-    ->set('notify.status_canceled', $form_state['values']['user_mail_status_canceled_notify'])
-    ->save();
-}
-
-/**
  * Menu callback: administer permissions.
  *
  * @ingroup forms