diff --git a/core/modules/user/config/schema/user.schema.yml b/core/modules/user/config/schema/user.schema.yml
index 989abae..bc8ac92 100644
--- a/core/modules/user/config/schema/user.schema.yml
+++ b/core/modules/user/config/schema/user.schema.yml
@@ -29,7 +29,7 @@ user.settings:
         status_blocked:
           type: boolean
           label: 'Account blocked'
-        status_cancelled:
+        status_canceled:
           type: boolean
           label: 'Account canceled'
         register_admin_created:
@@ -90,7 +90,7 @@ user.mail:
     label: 'Account blocked'
   status_canceled:
     type: mail
-    label: 'Account cancelled'
+    label: 'Account canceled'
   langcode:
     type: string
     label: 'Default language'
diff --git a/core/modules/user/config/user.role.anonymous.yml b/core/modules/user/config/user.role.anonymous.yml
index 1947f35..dbf7dd4 100644
--- a/core/modules/user/config/user.role.anonymous.yml
+++ b/core/modules/user/config/user.role.anonymous.yml
@@ -1,4 +1,4 @@
 id: anonymous
-label: Anonymous user
-weight: 0
+label: 'Anonymous user'
+weight: '0'
 langcode: en
diff --git a/core/modules/user/config/user.role.authenticated.yml b/core/modules/user/config/user.role.authenticated.yml
index 16df96d..c8b6429 100644
--- a/core/modules/user/config/user.role.authenticated.yml
+++ b/core/modules/user/config/user.role.authenticated.yml
@@ -1,4 +1,4 @@
 id: authenticated
-label: Authenticated user
-weight: 1
+label: 'Authenticated user'
+weight: '1'
 langcode: en
diff --git a/core/modules/user/config/user.settings.yml b/core/modules/user/config/user.settings.yml
index bdb3408..52711f4 100644
--- a/core/modules/user/config/user.settings.yml
+++ b/core/modules/user/config/user.settings.yml
@@ -6,11 +6,11 @@ notify:
   password_reset: '1'
   status_activated: '1'
   status_blocked: '0'
-  status_cancelled: '0'
+  status_canceled: '0'
   register_admin_created: '1'
   register_no_approval_required: '1'
   register_pending_approval: '1'
-register: visitors
+register: visitors_admin_approval
 signatures: '0'
 cancel_method: user_cancel_block
 password_reset_timeout: '86400'
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index c7fd16b..06608bd 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -526,7 +526,7 @@ function user_update_8004() {
     'user_cancel_method' => 'cancel_method',
     '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_mail_status_canceled_notify' => 'notify.status_canceled',
     'user_email_verification' => 'verify_mail',
     'user_password_reset_timeout' => 'password_reset_timeout',
   ));
diff --git a/core/profiles/standard/config/user.role.administrator.yml b/core/profiles/standard/config/user.role.administrator.yml
index 282e88c..67a6ef6 100644
--- a/core/profiles/standard/config/user.role.administrator.yml
+++ b/core/profiles/standard/config/user.role.administrator.yml
@@ -1,4 +1,4 @@
 id: administrator
 label: Administrator
-weight: 2
+weight: '2'
 langcode: en