diff --git a/include/class.email.php b/include/class.email.php
index 31c3dda775dd5f0b8aef0c6300e3a03f6f088add..2943192ef5c6734698829e874275c7574e590ed7 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -42,8 +42,9 @@ class EmailModel extends VerySimpleModel {
                 'title' =>
                 /* @trans */ 'Banlist',
                 'desc'  =>
-                /* @trans */ 'Ability to add/remove emails from banlist via ticket interface'),
-            );
+                /* @trans */ 'Ability to add/remove emails from banlist via ticket interface',
+                'primary' => true,
+            ));
 
     function getId() {
         return $this->email_id;
diff --git a/include/class.faq.php b/include/class.faq.php
index 9b95776031909bb948bacd74127e45182cca2135..a20060729ac804fe4284778fbe2424ba2002bffd 100644
--- a/include/class.faq.php
+++ b/include/class.faq.php
@@ -53,9 +53,9 @@ class FAQ extends VerySimpleModel {
                 'title' =>
                 /* @trans */ 'FAQ',
                 'desc'  =>
-                /* @trans */ 'Ability to add/update/disable/delete knowledgebase categories and FAQs'),
-            );
-
+                /* @trans */ 'Ability to add/update/disable/delete knowledgebase categories and FAQs',
+                'primary' => true,
+            ));
 
     var $attachments;
     var $topics;
diff --git a/include/class.organization.php b/include/class.organization.php
index 34ddcb15df54ccddcf9ad33ccdd0e8b0360b3b71..b5fed6c32115a366971834803f7f4f231771cdfc 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -43,14 +43,17 @@ class OrganizationModel extends VerySimpleModel {
         self::PERM_CREATE => array(
             'title' => /* @trans */ 'Create',
             'desc' => /* @trans */ 'Ability to create new organizations',
+            'primary' => true,
         ),
         self::PERM_EDIT => array(
             'title' => /* @trans */ 'Edit',
             'desc' => /* @trans */ 'Ability to manage organizations',
+            'primary' => true,
         ),
         self::PERM_DELETE => array(
             'title' => /* @trans */ 'Delete',
             'desc' => /* @trans */ 'Ability to delete organizations',
+            'primary' => true,
         ),
     );
 
diff --git a/include/class.report.php b/include/class.report.php
index 0e8bae980f7af555cd743551655df3fbdb89e7e5..059325b3f44a69c1905582ba1826a8594ad93dc1 100644
--- a/include/class.report.php
+++ b/include/class.report.php
@@ -9,8 +9,9 @@ class ReportModel {
                 'title' =>
                 /* @trans */ 'Stats',
                 'desc'  =>
-                /* @trans */ 'Ability to view stats of other agents in allowed departments'),
-            );
+                /* @trans */ 'Ability to view stats of other agents in allowed departments',
+                'primary' => true,
+            ));
 
     static function getPermissions() {
         return self::$perms;
diff --git a/include/class.search.php b/include/class.search.php
index 2ce10df368bf4700345231dafbe6d28bd176c3b8..84d3bbbcdc7d4478be5d1af5e733eadda3e7a323 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -35,7 +35,8 @@ abstract class SearchBackend {
     static protected $perms = array(
         self::PERM_EVERYTHING => array(
             'title' => /* @trans */ 'Search',
-            'desc'  => /* @trans */ 'See all tickets in search results, regardless of access'
+            'desc'  => /* @trans */ 'See all tickets in search results, regardless of access',
+            'primary' => true,
         ),
     );
 
diff --git a/include/class.user.php b/include/class.user.php
index becd978422b7c8509d174acaef2dc4066aa113eb..8f0d882c48a638faf0b51be85a93b34921be6334 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -79,22 +79,27 @@ class UserModel extends VerySimpleModel {
         self::PERM_CREATE => array(
             'title' => /* @trans */ 'Create',
             'desc' => /* @trans */ 'Ability to add new users',
+            'primary' => true,
         ),
         self::PERM_EDIT => array(
             'title' => /* @trans */ 'Edit',
             'desc' => /* @trans */ 'Ability to manage user information',
+            'primary' => true,
         ),
         self::PERM_DELETE => array(
             'title' => /* @trans */ 'Delete',
             'desc' => /* @trans */ 'Ability to delete users',
+            'primary' => true,
         ),
         self::PERM_MANAGE => array(
             'title' => /* @trans */ 'Manage Account',
             'desc' => /* @trans */ 'Ability to manage active user accounts',
+            'primary' => true,
         ),
         self::PERM_DIRECTORY => array(
             'title' => /* @trans */ 'User Directory',
             'desc' => /* @trans */ 'Ability to access the user directory',
+            'primary' => true,
         ),
     );
 
diff --git a/include/staff/role.inc.php b/include/staff/role.inc.php
index 25384cd39977d15950297605ec05bc11b3308db8..309d26d7bd86dfb74c6deb1fc8ffd020a0a3a92b 100644
--- a/include/staff/role.inc.php
+++ b/include/staff/role.inc.php
@@ -96,11 +96,15 @@ $info = Format::htmlchars(($errors && $_POST) ? array_merge($info, $_POST) : $in
                     (isset($setting[$k]) && $setting[$k]) ?  'checked="checked"' : '');
               ?>
                 
+              <?php echo Format::htmlchars(__($v['title'])); ?>
+              —
               <?php
-                echo sprintf('%s - <em>%s</em>',
-                      Format::htmlchars(__($v['title'])),
-                    Format::htmlchars(__($v['desc'])));
-              ?>
+              if ($v['primary']) { ?>
+              <i class="icon-globe faded" title="<?php echo
+                  __('This permission only applies to the staff primary role'); ?>"></i>
+<?php         } ?>
+              <em><?php echo Format::htmlchars(__($v['desc']));
+              ?></em>
              </label>
             </td>
           </tr>