diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index d53ad44d..d4d003fa 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -25,14 +25,11 @@
             <div ng-show="!filteredUsers.length && !filterSearch">
                 Loading...
             </div>
-            <div ng-show="!filteredUsers.length && filterSearch">
-                No people to list.
-            </div>
             <div class="table-responsive" ng-show="filteredUsers.length">
                 <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
                         <tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') |
-                            orderBy: ['type', 'name', 'email'])">
+                            orderBy: ['type', 'name', 'email']) track by user.id">
                             <td style="width: 70px;">
                                 <div class="btn-group" data-append-to="body">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html
index 233799d9..943079f4 100644
--- a/src/app/organization/views/organizationPeopleEdit.html
+++ b/src/app/organization/views/organizationPeopleEdit.html
@@ -36,7 +36,7 @@
             Loading...
         </div>
         <div ng-show="!loading && !subvaults.length">
-            <p>No subvaults.</p>
+            <p>No subvaults for your organization.</p>
         </div>
         <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
             <table class="table table-striped table-hover" style="margin: 0;">
diff --git a/src/app/organization/views/organizationPeopleInvite.html b/src/app/organization/views/organizationPeopleInvite.html
index 383a14a3..f49aaf4d 100644
--- a/src/app/organization/views/organizationPeopleInvite.html
+++ b/src/app/organization/views/organizationPeopleInvite.html
@@ -44,7 +44,7 @@
             Loading...
         </div>
         <div ng-show="!loading && !subvaults.length">
-            <p>No subvaults.</p>
+            <p>No subvaults for your organization.</p>
         </div>
         <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
             <table class="table table-striped table-hover" style="margin: 0;">
@@ -60,7 +60,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="subvault in subvaults | orderBy: ['name']">
+                    <tr ng-repeat="subvault in subvaults | orderBy: ['name'] track by subvault.id">
                         <td style="width: 40px;" valign="middle">
                             <input type="checkbox"
                                    name="selectedSubvaults[]"
diff --git a/src/app/organization/views/organizationSubvaults.html b/src/app/organization/views/organizationSubvaults.html
index 5bb9962d..76ffff05 100644
--- a/src/app/organization/views/organizationSubvaults.html
+++ b/src/app/organization/views/organizationSubvaults.html
@@ -29,14 +29,14 @@
                 No subvaults to list.
             </div>
             <div ng-show="!loading && !subvaults.length">
-                <p>No subvaults.</p>
+                <p>There are no subvaults yet for your organization.</p>
                 <button type="button" ng-click="add()" class="btn btn-default btn-flat">Add a Subvault</button>
             </div>
             <div class="table-responsive" ng-show="subvaults.length">
                 <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
                         <tr ng-repeat="subvault in filteredSubvaults = (subvaults | filter: (filterSearch || '') |
-                            orderBy: ['name'])">
+                            orderBy: ['name']) track by subvault.id">
                             <td style="width: 70px;">
                                 <div class="btn-group" data-append-to="body">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html
index 5420456d..b3be81f0 100644
--- a/src/app/organization/views/organizationSubvaultsUsers.html
+++ b/src/app/organization/views/organizationSubvaultsUsers.html
@@ -7,12 +7,15 @@
         Loading...
     </div>
     <div ng-show="!loading && !users.length">
-        <p>No users.</p>
+        <p>
+            No users for this subvault. You can associate a new user to this subvault by
+            selecting a specific user on the "People" page.
+        </p>
     </div>
     <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']">
+                <tr ng-repeat="user in users | orderBy: ['email'] track by user.id">
                     <td style="width: 70px;">
                         <div class="btn-group" data-append-to=".modal">
                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/src/app/organization/views/organizationVault.html b/src/app/organization/views/organizationVault.html
index b730c87e..43e500c9 100644
--- a/src/app/organization/views/organizationVault.html
+++ b/src/app/organization/views/organizationVault.html
@@ -11,7 +11,7 @@
 </section>
 <section class="content">
     <p ng-show="loading && !subvaults.length">Loading...</p>
-    <div class="box" ng-class="{'collapsed-box': subvault.collapsed}" ng-repeat="subvault in subvaults | 
+    <div class="box" ng-class="{'collapsed-box': subvault.collapsed}" ng-repeat="subvault in subvaults |
          orderBy: subvaultSort track by subvault.id"
          ng-show="subvaults.length">
         <div class="box-header with-border">
@@ -28,9 +28,8 @@
             </div>
         </div>
         <div class="box-body" ng-class="{'no-padding': subvaultLogins.length}">
-            <div ng-show="!subvaultLogins.length">
-                <p>No logins in this subvault.</p>
-            </div>
+            <div ng-show="!subvaultLogins.length && subvault.id">No logins in this subvault.</div>
+            <div ng-show="!subvaultLogins.length && !subvault.id">No unassigned logins.</div>
             <div class="table-responsive" ng-show="subvaultLogins.length">
                 <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
diff --git a/src/app/organization/views/organizationVaultLoginSubvaults.html b/src/app/organization/views/organizationVaultLoginSubvaults.html
index c516b857..3f163d46 100644
--- a/src/app/organization/views/organizationVaultLoginSubvaults.html
+++ b/src/app/organization/views/organizationVaultLoginSubvaults.html
@@ -27,7 +27,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="subvault in subvaults | orderBy: ['name']">
+                    <tr ng-repeat="subvault in subvaults | orderBy: ['name'] track by subvault.id">
                         <td valign="middle">
                             <input type="checkbox"
                                    name="selectedSubvaults[]"