diff --git a/src/app/vault/vaultLoginSubvaultsController.js b/src/app/vault/vaultLoginSubvaultsController.js
index 923779d7..bc5fca7c 100644
--- a/src/app/vault/vaultLoginSubvaultsController.js
+++ b/src/app/vault/vaultLoginSubvaultsController.js
@@ -32,9 +32,10 @@
                     return cipher;
                 }
 
-                return;
+                return null;
             }).then(function (cipher) {
-                if (!cipher.Edit) {
+                if (!cipher) {
+                    $scope.loadingSubvaults = false;
                     return;
                 }
 
diff --git a/src/app/vault/views/vaultLoginSubvaults.html b/src/app/vault/views/vaultLoginSubvaults.html
index 63569f78..6d8d1ac2 100644
--- a/src/app/vault/views/vaultLoginSubvaults.html
+++ b/src/app/vault/views/vaultLoginSubvaults.html
@@ -15,7 +15,7 @@
             Loading...
         </div>
         <div ng-show="!loadingSubvaults && !subvaults.length">
-            <p>No subvaults.</p>
+            <p>No subvaults to manage.</p>
         </div>
         <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
             <table class="table table-striped table-hover" style="margin: 0;">