diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 93743e4..dbcd5c5 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -159,9 +159,9 @@ theme_settings:
         comment_user_picture:
           type: boolean
           label: 'User pictures in comments'
-        comment_user_verification:
+        user_verification_status:
           type: boolean
-          label: 'User verification status in comments'
+          label: 'User verification status'
         favicon:
           type: boolean
           label: 'Shortcut icon'
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 4059d79..1eb6c3d 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -28,7 +28,7 @@ class ThemeHandler implements ThemeHandlerInterface {
     'slogan',
     'node_user_picture',
     'comment_user_picture',
-    'comment_user_verification',
+    'user_verification_status',
   );
 
   /**
diff --git a/core/modules/system/src/Form/ThemeSettingsForm.php b/core/modules/system/src/Form/ThemeSettingsForm.php
index fd8b777..4587b09 100644
--- a/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -146,7 +146,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
       'slogan' => t('Site slogan'),
       'node_user_picture' => t('User pictures in posts'),
       'comment_user_picture' => t('User pictures in comments'),
-      'comment_user_verification' => t('User verification status in comments'),
+      'user_verification_status' => t('User verification status'),
       'favicon' => t('Shortcut icon'),
     );
 
@@ -156,10 +156,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
       $disabled['toggle_node_user_picture'] = TRUE;
       $disabled['toggle_comment_user_picture'] = TRUE;
     }
-    if (!$this->moduleHandler->moduleExists('comment')) {
-      $disabled['toggle_comment_user_picture'] = TRUE;
-      $disabled['toggle_comment_user_verification'] = TRUE;
-    }
+    
 
     $form['theme_settings'] = array(
       '#type' => 'details',
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index b157f1f..99509cb 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -451,7 +451,7 @@ function template_preprocess_username(&$variables) {
   $variables['extra'] = '';
   $variables['uid'] = $account->id();
   if (empty($variables['uid'])) {
-    if (theme_get_setting('features.comment_user_verification')) {
+    if (theme_get_setting('features.user_verification_status')) {
       $variables['extra'] = ' (' . t('not verified') . ')';
     }
   }