diff --git a/beta2beta/beta2beta.install b/beta2beta/beta2beta.install
index 0851877..a848145 100644
--- a/beta2beta/beta2beta.install
+++ b/beta2beta/beta2beta.install
@@ -76,6 +76,13 @@ function beta2beta_update_8803() {
 }
 
 /**
+ * Admin role is now a flag on role storage.
+ */
+function beta2beta_update_8804() {
+  beta2beta_update_helper('2435075', 8);
+}
+
+/**
  * @} End of "defgroup updates-beta-7-to-8"
  */
 
diff --git a/beta2beta/src/Tests/Update/Beta7UpdatePath.php b/beta2beta/src/Tests/Update/Beta7UpdatePath.php
index 8baec4e..d7709de 100644
--- a/beta2beta/src/Tests/Update/Beta7UpdatePath.php
+++ b/beta2beta/src/Tests/Update/Beta7UpdatePath.php
@@ -9,9 +9,10 @@ namespace Drupal\beta2beta\Tests\Update;
 
 use Drupal\beta2beta\Tests\Update\TestTraits\FrontPage;
 use Drupal\beta2beta\Tests\Update\TestTraits\NewNode;
+use Drupal\user\Entity\Role;
 
 /**
- * Tests the beta 10 update path.
+ * Tests the beta 7 update path.
  *
  * @group beta2beta
  */
@@ -35,4 +36,20 @@ class Beta7UpdatePath extends Beta2BetaUpdateTestBase {
    */
   protected static $startingBeta = 7;
 
+  /**
+   * Test that the admin role flag gets set.
+   */
+  public function testUpdate8804() {
+    // Make sure the admin role is configured as expected.
+    $user_settings = \Drupal::configFactory()->getEditable('user.settings');
+    $this->assertEqual($user_settings->get('admin_role'), 'administrator', 'The admin_role is set to administrator before updates.');
+    $this->runUpdates();
+    $user_settings = \Drupal::configFactory()->getEditable('user.settings');
+    $this->assertNull($user_settings->get('admin_role'), 'The admin_role setting has been removed.');
+    $admin_role = Role::load('administrator');
+    $this->assertTrue($admin_role->isAdmin(), 'The admin role flag is properly set on the administrator role.');
+    $authenticated_user_role = Role::load('authenticated');
+    $this->assertFalse($authenticated_user_role->isAdmin(), 'Authenticated user role remains a non-admin role.');
+  }
+
 }
diff --git a/head2head.module b/head2head.module
index 19969eb..7e8bf20 100644
--- a/head2head.module
+++ b/head2head.module
@@ -15,6 +15,7 @@ use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\user\Entity\Role;
 
 /**
  * Converts Taxonomy term reference fields to Entity reference.
@@ -257,6 +258,21 @@ function head2head_2431329() {
 }
 
 /**
+ * Set the admin role flag.
+ */
+function head2head_2435075() {
+  $user_settings = \Drupal::configFactory()->getEditable('user.settings');
+  if ($admin_role_id = $user_settings->get('admin_role')) {
+    $role = Role::load($admin_role_id);
+    $role->set('permissions', []);
+    $role->setIsAdmin(TRUE);
+    $role->save();
+    $user_settings->clear('admin_role');
+    $user_settings->save();
+  }
+}
+
+/**
  * Updates views to use the entity's field data table, if available.
  */
 function head2head_2429447() {