diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js
index ceb61b566..f03170eb4 100644
--- a/addons/api/mirage/scenarios/default.js
+++ b/addons/api/mirage/scenarios/default.js
@@ -51,5 +51,8 @@ export default function (server) {
     server.createList('target', 2, { scope }, 'withAssociations');
     // Sessions have target data. Create it after targets.
     server.createList('session', 4, { scope }, 'withAssociations');
+    // Create IAM resources for project
+    server.createList('group', 3, { scope });
+    server.createList('role', 3, { scope });
   });
 }
diff --git a/ui/admin/app/components/form/role/add-principals/index.hbs b/ui/admin/app/components/form/role/add-principals/index.hbs
index 04cde2bbb..9fa698c63 100644
--- a/ui/admin/app/components/form/role/add-principals/index.hbs
+++ b/ui/admin/app/components/form/role/add-principals/index.hbs
@@ -44,12 +44,23 @@
             </row.headerCell>
             <row.cell>{{principal.id}}</row.cell>
             <row.cell>
-              <Rose::Badge>{{t
+              <Rose::Badge
+                @icon={{if
+                  (eq principal.constructor.modelName 'group')
+                  'flight-icons/svg/folder-users-16'
+                  'flight-icons/svg/user-16'
+                }}
+              >
+                {{t
                   (concat
                     'resources.role.principal.types.'
                     principal.constructor.modelName
                   )
-                }}</Rose::Badge>
+                }}
+              </Rose::Badge>
+            </row.cell>
+            <row.cell>
+              <ScopeBadge @scope={{principal.scopeModel}} />
             </row.cell>
             <row.cell>
               <ScopeBadge @scope={{principal.scopeModel}} />
diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs
index 20ad15e36..81267ca84 100644
--- a/ui/admin/app/templates/scopes/scope.hbs
+++ b/ui/admin/app/templates/scopes/scope.hbs
@@ -107,40 +107,47 @@
         </Rose::Nav::Sidebar>
       {{/if}}
 
-      {{#unless @model.isProject}}
-        <Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
+      <Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
+        {{! Users are available only for org/global scopes }}
+        {{#unless @model.isProject}}
           {{#if (can 'navigate model' @model collection='users')}}
             <nav.link @route='scopes.scope.users'>
               <Rose::Icon @name='flight-icons/svg/users-16' @size='medium' />
               {{t 'resources.user.title_plural'}}
             </nav.link>
           {{/if}}
-          {{#if (can 'navigate model' @model collection='groups')}}
-            <nav.link @route='scopes.scope.groups'>
-              <Rose::Icon
-                @name='flight-icons/svg/folder-users-16'
-                @size='medium'
-              />
-              {{t 'resources.group.title_plural'}}
-            </nav.link>
-          {{/if}}
-          {{#if (can 'navigate model' @model collection='roles')}}
-            <nav.link @route='scopes.scope.roles'>
-              <Rose::Icon
-                @name='flight-icons/svg/identity-user-16'
-                @size='medium'
-              />
-              {{t 'resources.role.title_plural'}}
-            </nav.link>
-          {{/if}}
+        {{/unless}}
+
+        {{! Groups and roles are available for all scopes }}
+        {{#if (can 'navigate model' @model collection='groups')}}
+          <nav.link @route='scopes.scope.groups'>
+            <Rose::Icon
+              @name='flight-icons/svg/folder-users-16'
+              @size='medium'
+            />
+            {{t 'resources.group.title_plural'}}
+          </nav.link>
+        {{/if}}
+        {{#if (can 'navigate model' @model collection='roles')}}
+          <nav.link @route='scopes.scope.roles'>
+            <Rose::Icon
+              @name='flight-icons/svg/identity-user-16'
+              @size='medium'
+            />
+            {{t 'resources.role.title_plural'}}
+          </nav.link>
+        {{/if}}
+
+        {{! Auth methods are available only for org/global scopes }}
+        {{#unless @model.isProject}}
           {{#if (can 'navigate model' @model collection='auth-methods')}}
             <nav.link @route='scopes.scope.auth-methods'>
               <Rose::Icon @name='flight-icons/svg/lock-16' @size='medium' />
               {{t 'resources.auth-method.title_plural'}}
             </nav.link>
           {{/if}}
-        </Rose::Nav::Sidebar>
-      {{/unless}}
+        {{/unless}}
+      </Rose::Nav::Sidebar>
 
       {{#if @model.isOrg}}
         {{#if this.session.data.authenticated.isGlobal}}
diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs
index 19fd914dc..6790efbce 100644
--- a/ui/admin/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs
@@ -72,7 +72,7 @@
           <message.description>
             {{#if (can 'list model' this.scope collection='roles')}}
               {{! can list (at least):  show default welcome message}}
-              {{t 'resources.roles.description'}}
+              {{t 'resources.role.description'}}
             {{else if (can 'create model' this.scope collection='roles')}}
               {{! can create (only):  show create-but-not-list welcome message}}
               {{t
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
index 6d17d1259..dff671518 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -62,9 +62,17 @@
                 </Copyable>
               </row.cell>
               <row.cell>
-                <Rose::Badge>{{t
+                <Rose::Badge
+                  @icon={{if
+                    (eq principal.type 'group')
+                    'flight-icons/svg/folder-users-16'
+                    'flight-icons/svg/user-16'
+                  }}
+                >
+                  {{t
                     (concat 'resources.role.principal.types.' principal.type)
-                  }}</Rose::Badge>
+                  }}
+                </Rose::Badge>
               </row.cell>
               <row.cell>
                 <ScopeBadge @scope={{principal.model.scopeModel}} />