diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js
index 7f231e2792..f06038142b 100644
--- a/src/app/organization/organizationPeopleController.js
+++ b/src/app/organization/organizationPeopleController.js
@@ -89,7 +89,8 @@
                         name: list.Data[i].Name,
                         email: list.Data[i].Email,
                         status: list.Data[i].Status,
-                        type: list.Data[i].Type
+                        type: list.Data[i].Type,
+                        accessAllSubvaults: list.Data[i].AccessAllSubvaults
                     };
 
                     users.push(user);
diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js
index 959e2ed180..7a0696e539 100644
--- a/src/app/organization/organizationSubvaultsUsersController.js
+++ b/src/app/organization/organizationSubvaultsUsersController.js
@@ -25,7 +25,8 @@
                                 email: userList.Data[i].Email,
                                 type: userList.Data[i].Type,
                                 status: userList.Data[i].Status,
-                                readOnly: userList.Data[i].ReadOnly
+                                readOnly: userList.Data[i].ReadOnly,
+                                accessAllSubvaults: userList.Data[i].AccessAllSubvaults
                             });
                         }
                         $scope.users = users;
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index d4d003fa1b..ea26aa56d7 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -64,6 +64,8 @@
                             </td>
                             <td>
                                 <a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a>
+                                <i class="fa fa-share-alt text-muted" ng-show="user.accessAllSubvaults"
+                                   title="Can Access All Subvaults"></i>
                                 <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
                             </td>
                             <td style="width: 100px;">
diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html
index b3be81f022..1619a91a94 100644
--- a/src/app/organization/views/organizationSubvaultsUsers.html
+++ b/src/app/organization/views/organizationSubvaultsUsers.html
@@ -15,18 +15,23 @@
     <div class="table-responsive" ng-show="users.length" style="margin: 0;">
         <table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
             <tbody>
-                <tr ng-repeat="user in users | orderBy: ['email'] track by user.id">
+                <tr ng-repeat="user in users | orderBy: ['email']">
                     <td style="width: 70px;">
                         <div class="btn-group" data-append-to=".modal">
                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                 <i class="fa fa-cog"></i> <span class="caret"></span>
                             </button>
                             <ul class="dropdown-menu">
-                                <li>
+                                <li ng-show="user.id">
                                     <a href="javascript:void(0)" ng-click="remove(user)" class="text-red">
                                         <i class="fa fa-fw fa-remove"></i> Remove
                                     </a>
                                 </li>
+                                <li ng-show="!user.id">
+                                    <a href="javascript:void(0)">
+                                        No options...
+                                    </a>
+                                </li>
                             </ul>
                         </div>
                     </td>
@@ -37,8 +42,9 @@
                         {{user.email}}
                         <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
                     </td>
-                    <td style="width: 40px;" align="center">
+                    <td style="width: 60px;" align="center">
                         <i class="fa fa-pencil-square-o" ng-show="!user.readOnly" title="Can Edit"></i>
+                        <i class="fa fa-share-alt" ng-show="user.accessAllSubvaults" title="Can Access All Subvaults"></i>
                     </td>
                     <td style="width: 100px;">
                         {{user.type | enumName: 'OrgUserType'}}