diff --git a/application/controllers/RolesController.php b/application/controllers/RolesController.php
index 7b66b1fa8..097c79e29 100644
--- a/application/controllers/RolesController.php
+++ b/application/controllers/RolesController.php
@@ -45,6 +45,7 @@ class RolesController extends ActionController
             'title' => $this->translate('Roles'),
             'url'   => 'roles'
         ));
+        $this->getTabs()->setTitle($this->translate('Role Configuration'));
     }
 
     /**
diff --git a/application/views/scripts/roles/index.phtml b/application/views/scripts/roles/index.phtml
index c08a0b6a4..4ff2da81e 100644
--- a/application/views/scripts/roles/index.phtml
+++ b/application/views/scripts/roles/index.phtml
@@ -1,8 +1,20 @@
 <div class="controls" data-base-target="_main">
     <?= $tabs ?>
-    <h1><?= $this->translate('Roles') ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-index">
+        <?= $this->translate('Roles') ?>
+    </h1>
+    <div class="skip-links skip-links-inline">
+        <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+        <ul>
+            <li>
+                <a tabindex="0" href="#roles-index-new">
+                    <?= t('Skip To Create New Role'); ?>
+                </a>
+            </li>
+        </ul>
+    </div>
     <div>
         <?php /** @var \Icinga\Application\Config $roles */ if ($roles->isEmpty()): ?>
             <?= $this->translate('No roles found.') ?>
@@ -64,6 +76,9 @@
                 </tbody>
             </table>
         <?php endif ?>
+        <h2 tabindex="-1" id="roles-index-new" class="sr-only">
+            <?= $this->translate('Create New Role'); ?>
+        </h2>
         <a data-base-target="_next" href="<?= $this->href('roles/new') ?>">
             <?= $this->translate('New Role') ?>
         </a>
diff --git a/application/views/scripts/roles/new.phtml b/application/views/scripts/roles/new.phtml
index 4c21c6f6b..d18ada1a5 100644
--- a/application/views/scripts/roles/new.phtml
+++ b/application/views/scripts/roles/new.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= $this->translate('New Role') ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-new">
+        <?= $this->translate('New Role') ?>
+    </h1>
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/remove.phtml b/application/views/scripts/roles/remove.phtml
index 4abff566a..432c3602d 100644
--- a/application/views/scripts/roles/remove.phtml
+++ b/application/views/scripts/roles/remove.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= sprintf($this->translate('Remove Role %s'), $name) ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-remove">
+        <?= sprintf($this->translate('Remove Role %s'), $name) ?>
+    </h1>
     <?= $form ?>
 </div>
diff --git a/application/views/scripts/roles/update.phtml b/application/views/scripts/roles/update.phtml
index f48f1ca69..32ab7d018 100644
--- a/application/views/scripts/roles/update.phtml
+++ b/application/views/scripts/roles/update.phtml
@@ -1,7 +1,9 @@
 <div class="controls">
     <?= $tabs->showOnlyCloseButton() ?>
-    <h1><?= sprintf($this->translate('Update Role %s'), $name) ?></h1>
 </div>
 <div class="content">
+    <h1 tabindex="-1" id="roles-update">
+        <?= sprintf($this->translate('Update Role %s'), $name) ?>
+    </h1>
     <?= $form ?>
 </div>