diff -u b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
--- b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
+++ b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
@@ -38,7 +38,7 @@
    * Test OpenID auto-registration with e-mail verification enabled.
    */
   function testRegisterUserWithEmailVerification() {
-    config('user.settings')->set('mail_verification', TRUE)->save();
+    config('user.settings')->set('verify_mail', TRUE)->save();
     variable_get('configurable_timezones', 1);
     variable_set('date_default_timezone', 'Europe/Brussels');
 
@@ -95,7 +95,7 @@
    * Test OpenID auto-registration with e-mail verification disabled.
    */
   function testRegisterUserWithoutEmailVerification() {
-    config('user.settings')->set('mail_verification', FALSE)->save();
+    config('user.settings')->set('verify_mail', FALSE)->save();
     variable_get('configurable_timezones', 1);
     variable_set('date_default_timezone', 'Europe/Brussels');
 
@@ -227,7 +227,7 @@
    * but no SREG.
    */
   function testRegisterUserWithAXButNoSREG() {
-    config('user.settings')->set('mail_verification', FALSE)->save();
+    config('user.settings')->set('verify_mail', FALSE)->save();
     variable_set('date_default_timezone', 'Europe/Brussels');
 
     // Tell openid_test.module to respond with these AX fields.
diff -u b/core/modules/openid/openid.module b/core/modules/openid/openid.module
--- b/core/modules/openid/openid.module
+++ b/core/modules/openid/openid.module
@@ -86,7 +86,7 @@
 function openid_user_insert($account) {
   if (!empty($account->openid_claimed_id)) {
     // The user has registered after trying to log in via OpenID.
-    if (config('user.settings')->get('mail_verification')) {
+    if (config('user.settings')->get('verify_mail')) {
       drupal_set_message(t('Once you have verified your e-mail address, you may log in via OpenID.'));
     }
     user_set_authmaps($account, array('authname_openid' => $account->openid_claimed_id));
@@ -218,7 +218,7 @@
 
     // If email verification is off, hide the password field and just fill
     // with random password to avoid confusion.
-    if (!config('user.settings')->get('mail_verification')) {
+    if (!config('user.settings')->get('verify_mail')) {
       $form['account']['pass']['#type'] = 'hidden';
       $form['account']['pass']['#value'] = user_password();
     }
@@ -709,7 +709,7 @@
 
   $account = user_external_load($identity);
   if (isset($account->uid)) {
-    if (!config('user.settings')->get('mail_verification') || $account->login) {
+    if (!config('user.settings')->get('verify_mail') || $account->login) {
       // Check if user is blocked.
       $state['values']['name'] = $account->name;
       user_login_name_validate(array(), $state);
reverted:
--- b/core/modules/user/config/user.settings.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-admin_role: ''
-anonymous: Anonymous
-mail_verification: '1'
-notify:
-    cancel_confirm: '1'
-    password_reset: '1'
-    status_activated: '1'
-    status_blocked: '0'
-    status_cancelled: '0'
-    register_admin_created: '1'
-    register_no_approval_required: '1'
-    register_pending_approval: '1'
-register: visitors
-signatures: '0'
diff -u b/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
--- b/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -102,7 +102,7 @@
         $form['#validate'][] = 'user_validate_current_pass';
       }
     }
-    elseif (!$config->get('mail_verification') || $admin) {
+    elseif (!$config->get('verify_mail') || $admin) {
       $form['account']['pass'] = array(
         '#type' => 'password_confirm',
         '#size' => 25,
diff -u b/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/lib/Drupal/user/RegisterFormController.php
--- b/core/modules/user/lib/Drupal/user/RegisterFormController.php
+++ b/core/modules/user/lib/Drupal/user/RegisterFormController.php
@@ -74,7 +74,7 @@
   public function submit(array $form, array &$form_state) {
     $admin = $form_state['values']['administer_users'];
 
-    if (!config('user.settings')->get('mail_verification') || $admin) {
+    if (!config('user.settings')->get('verify_mail') || $admin) {
       $pass = $form_state['values']['pass'];
     }
     else {
@@ -121,7 +121,7 @@
       drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.', array('@url' => url($uri['path'], $uri['options']), '%name' => $account->name)));
     }
     // No e-mail verification required; log in user immediately.
-    elseif (!$admin && !config('user.settings')->get('mail_verification') && $account->status) {
+    elseif (!$admin && !config('user.settings')->get('verify_mail') && $account->status) {
       _user_mail_notify('register_no_approval_required', $account);
       $form_state['uid'] = $account->uid;
       user_login_submit(array(), $form_state);
diff -u b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
--- b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
@@ -29,7 +29,7 @@
   function testRegistrationWithEmailVerification() {
     $config = config('user.settings');
     // Require e-mail verification.
-    $config->set('mail_verification', TRUE)->save();
+    $config->set('verify_mail', TRUE)->save();
 
     // Set registration to administrator only.
     $config->set('register', USER_REGISTER_ADMINISTRATORS_ONLY)->save();
@@ -64,7 +64,7 @@
     // Don't require e-mail verification and allow registration by site visitors
     // without administrator approval.
     $config
-      ->set('mail_verification', FALSE)
+      ->set('verify_mail', FALSE)
       ->set('register', USER_REGISTER_VISITORS)
       ->save();
 
@@ -126,7 +126,7 @@
     // Don't require e-mail verification and allow registration by site visitors
     // without administrator approval.
     config('user.settings')
-      ->set('mail_verification', FALSE)
+      ->set('verify_mail', FALSE)
       ->set('register', USER_REGISTER_VISITORS)
       ->save();
 
@@ -153,7 +153,7 @@
     // Don't require e-mail verification and allow registration by site visitors
     // without administrator approval.
     $config
-      ->set('mail_verification', FALSE)
+      ->set('verify_mail', FALSE)
       ->set('register', USER_REGISTER_VISITORS)
       ->save();
 
diff -u b/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
--- b/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -314,7 +314,7 @@
   $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('mail_verification'),
+    '#default_value' => $config->get('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');
@@ -652,7 +652,7 @@
     ->set('anonymous', $form_state['values']['anonymous'])
     ->set('admin_role', $form_state['values']['user_admin_role'])
     ->set('register', $form_state['values']['user_register'])
-    ->set('mail_verification', $form_state['values']['user_email_verification'])
+    ->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'])
diff -u b/core/modules/user/user.install b/core/modules/user/user.install
--- b/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -488,7 +488,7 @@
     'user_mail_status_activated_notify' => 'notify.status_activated',
     'user_mail_status_blocked_notify' => 'notify.status_blocked',
     'user_mail_status_cancelled_notify' => 'notify.status_cancelled',
-    'user_email_verification' => 'mail_verification',
+    'user_email_verification' => 'verify_mail',
   ));
 
   // Convert the user.settings:register numeric value to text value.