diff --git a/src/Form/ContentAccessAdminSettingsForm.php b/src/Form/ContentAccessAdminSettingsForm.php
index a8caa8a..f5f5030 100644
--- a/src/Form/ContentAccessAdminSettingsForm.php
+++ b/src/Form/ContentAccessAdminSettingsForm.php
@@ -6,7 +6,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\user\Entity\Role;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\user\PermissionHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -31,6 +31,13 @@ class ContentAccessAdminSettingsForm extends FormBase {
    */
   protected $moduleHandler;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Constructs a new ContentAccessAdminSettingsForm.
    *
@@ -38,10 +45,13 @@ class ContentAccessAdminSettingsForm extends FormBase {
    *   The permission handler.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
+   *  @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The EntityTypeManager.
    */
-  public function __construct(PermissionHandlerInterface $permission_handler, ModuleHandlerInterface $module_handler) {
+  public function __construct(PermissionHandlerInterface $permission_handler, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager) {
     $this->permissionHandler = $permission_handler;
     $this->moduleHandler = $module_handler;
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -50,7 +60,8 @@ class ContentAccessAdminSettingsForm extends FormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('user.permissions'),
-      $container->get('module_handler')
+      $container->get('module_handler'),
+      $container->get('entity_type.manager')
     );
   }
 
@@ -120,8 +131,7 @@ class ContentAccessAdminSettingsForm extends FormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $values = $form_state->getValues();
     $storage = $form_state->getStorage();
-    /** @var \Drupal\user\Entity\Role $roles */
-    $roles = Role::loadMultiple();
+    $roles =  $this->entityTypeManager->getStorage('user_role')->loadMultiple();
     $roles_permissions = [];
     foreach ($roles as $rid => $role) {
       $roles_permissions[$rid] = $role->getPermissions();