diff --git a/core/modules/contact/config/contact.category.personal.yml b/core/modules/contact/config/contact.category.personal.yml
index fcd7b66..6b40a8d 100644
--- a/core/modules/contact/config/contact.category.personal.yml
+++ b/core/modules/contact/config/contact.category.personal.yml
@@ -1,4 +1,4 @@
-id: user
+id: personal
 label: 'Personal contact form'
 recipients: []
 reply: ''
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php b/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
index 62c0dfa..fd446c2 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
@@ -21,9 +21,14 @@ class CategoryAccessController extends EntityAccessController {
   /**
    * {@inheritdoc}
    */
-  public function deleteAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
-    // Do not allow delete 'user' category used for personal contact form.
-    return user_access('administer contact forms') && $entity->id() !== 'user';
+  public function checkAccess(EntityInterface $entity, $operation, $langcode, User $account) {
+    if ($operation == 'delete') {
+      // Do not allow delete 'personal' category used for personal contact form.
+      return user_access('administer contact forms', $account) && $entity->id() !== 'personal';
+    }
+    else {
+      return user_access('administer contact forms', $account);
+    }
   }
 
 }
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryFormController.php b/core/modules/contact/lib/Drupal/contact/CategoryFormController.php
index 518bea9..d94b2f4 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryFormController.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryFormController.php
@@ -38,7 +38,7 @@ public function form(array $form, array &$form_state) {
         'exists' => 'contact_category_load',
       ),
       // Do not allow change 'user' category used for personal contact form.
-      '#disabled' => !$category->isNew() || $category->id() == 'user',
+      '#disabled' => !$category->isNew() || $category->id() == 'personal',
     );
     $form['recipients'] = array(
       '#type' => 'textarea',