diff --git a/static/css/quay.css b/static/css/quay.css
index a26dde81d..95cd591da 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -975,19 +975,13 @@ p.editable:hover i {
   width: 620px;
 }
 
-.repo-admin .user i {
+.repo-admin .user i.fa-user {
   margin-left: 2px;
   margin-right: 7px;
-  color: rgb(79, 195, 79);
 }
 
-.repo-admin .user.outside i {
-  color: rgb(224, 173, 41);
-}
-
-.repo-admin .team i {
+.repo-admin .team i.fa-group {
   margin-right: 4px;
-  color: rgb(79, 195, 79);
 }
 
 .repo-admin .entity {
@@ -995,11 +989,21 @@ p.editable:hover i {
   min-width: 300px;
 }
 
+.repo-admin .entity .popover {
+  font-size: 14px;
+}
+
+.repo-admin .entity i.fa-exclamation-triangle {
+  color: #c09853;
+  float: right;
+  margin-right: 10px;
+  margin-top: 4px;
+}
+
 .repo-admin .token a {
   cursor: pointer;
 }
 
-
 .repo .build-info {
   padding: 10px;
   margin: 0px;
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index e796df800..4ca9fa9a4 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -31,7 +31,7 @@
           <tr>
             <td>User<span ng-show="repo.is_organization">/Team</span></td>
             <td>Permissions</td>
-            <td></td>
+            <td style="width: 95px;"></td>
           </tr>
         </thead>
         
@@ -57,6 +57,7 @@
           <td class="{{ 'user entity ' + (permission.is_org_member ? '' : 'outside') }}">
             <i class="fa fa-user"></i> 
             <span>{{name}}</span>
+            <i class="fa fa-exclamation-triangle" ng-show="!permission.is_org_member" data-trigger="hover" bs-popover="{'content': 'This user is not a member of the organization'}"></i>
           </td>
           <td class="user-permissions">
             <div class="btn-group btn-group-sm">