diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html
index 50a7f404a26..233799d9a8f 100644
--- a/src/app/organization/views/organizationPeopleEdit.html
+++ b/src/app/organization/views/organizationPeopleEdit.html
@@ -53,7 +53,7 @@
                 </thead>
                 <tbody>
                     <tr ng-repeat="subvault in subvaults | orderBy: ['name']">
-                        <td style="valign="middle">
+                        <td valign="middle">
                             <input type="checkbox"
                                    name="selectedSubvaults[]"
                                    value="{{subvault.id}}"
diff --git a/src/app/services/apiService.js b/src/app/services/apiService.js
index 66b53155688..813b30ad3be 100644
--- a/src/app/services/apiService.js
+++ b/src/app/services/apiService.js
@@ -23,8 +23,9 @@
 
         _service.ciphers = $resource(_apiUri + '/ciphers/:id', {}, {
             get: { method: 'GET', params: { id: '@id' } },
+            getFullDetails: { url: _apiUri + '/ciphers/:id/full-details', method: 'GET', params: { id: '@id' } },
             list: { method: 'GET', params: {} },
-            listSubvaults: { url: _apiUri + '/ciphers/subvaults', method: 'GET', params: {} },
+            listDetails: { url: _apiUri + '/ciphers/details', method: 'GET', params: {} },
             'import': { url: _apiUri + '/ciphers/import', method: 'POST', params: {} },
             favorite: { url: _apiUri + '/ciphers/:id/favorite', method: 'POST', params: { id: '@id' } },
             putPartial: { url: _apiUri + '/ciphers/:id/partial', method: 'POST', params: { id: '@id' } },
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index b1cc18aba21..be12b5760b0 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -212,4 +212,19 @@
 
             });
         };
+
+        $scope.subvaults = function (login) {
+            var modal = $uibModal.open({
+                animation: true,
+                templateUrl: 'app/vault/views/vaultLoginSubvaults.html',
+                controller: 'vaultLoginSubvaultsController',
+                resolve: {
+                    loginId: function () { return login.id; }
+                }
+            });
+
+            modal.result.then(function () {
+
+            });
+        };
     });
diff --git a/src/app/vault/vaultLoginSubvaultsController.js b/src/app/vault/vaultLoginSubvaultsController.js
new file mode 100644
index 00000000000..7f6374b6332
--- /dev/null
+++ b/src/app/vault/vaultLoginSubvaultsController.js
@@ -0,0 +1,101 @@
+angular
+    .module('bit.vault')
+
+    .controller('vaultLoginSubvaultsController', function ($scope, apiService, $uibModalInstance, cipherService,
+        loginId, $analytics) {
+        $analytics.eventTrack('vaultLoginSubvaultsController', { category: 'Modal' });
+        $scope.login = {};
+        $scope.readOnly = false;
+        $scope.loadingLogin = true;
+        $scope.loadingSubvaults = true;
+        $scope.selectedSubvaults = {};
+
+        $uibModalInstance.opened.then(function () {
+            apiService.ciphers.getFullDetails({ id: loginId }).$promise.then(function (cipher) {
+                $scope.loadingLogin = false;
+
+                $scope.readOnly = !cipher.Edit;
+                if (cipher.Edit && cipher.OrganizationId) {
+                    if (cipher.Type === 1) {
+                        $scope.login = cipherService.decryptLoginPreview(cipher);
+                    }
+
+                    var subvaults = {};
+                    if (cipher.SubvaultIds) {
+                        for (var i = 0; i < cipher.SubvaultIds.length; i++) {
+                            subvaults[cipher.SubvaultIds[i]] = true;
+                        }
+                    }
+                    $scope.selectedSubvaults = subvaults;
+
+                    return cipher;
+                }
+
+                return;
+            }).then(function (cipher) {
+                if (!cipher.Edit) {
+                    return;
+                }
+
+                apiService.subvaults.listMe(function (response) {
+                    var subvaults = [];
+                    for (var i = 0; i < response.Data.length; i++) {
+                        if (response.Data[i].OrganizationId !== cipher.OrganizationId) {
+                            continue;
+                        }
+
+                        var decSubvault = cipherService.decryptSubvault(response.Data[i]);
+                        subvaults.push(decSubvault);
+                    }
+
+                    $scope.loadingSubvaults = false;
+                    $scope.subvaults = subvaults;
+                });
+            });
+        });
+
+        $scope.toggleSubvaultSelectionAll = function ($event) {
+            var subvaults = {};
+            if ($event.target.checked) {
+                for (var i = 0; i < $scope.subvaults.length; i++) {
+                    subvaults[$scope.subvaults[i].id] = true;
+                }
+            }
+
+            $scope.selectedSubvaults = subvaults;
+        };
+
+        $scope.toggleSubvaultSelection = function (id) {
+            if (id in $scope.selectedSubvaults) {
+                delete $scope.selectedSubvaults[id];
+            }
+            else {
+                $scope.selectedSubvaults[id] = true;
+            }
+        };
+
+        $scope.subvaultSelected = function (subvault) {
+            return subvault.id in $scope.selectedSubvaults;
+        };
+
+        $scope.allSelected = function () {
+            return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length;
+        };
+
+        $scope.save = function (model) {
+            var request = {
+                subvaultIds: model.subvaultIds
+            };
+
+            $scope.savePromise = apiService.ciphers.putSubvaults({ id: loginId }, request, function (response) {
+                $analytics.eventTrack('Edited Login Subvaults');
+                $uibModalInstance.close({
+                    action: 'subvaultsEdit'
+                });
+            }).$promise;
+        };
+
+        $scope.close = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    });
diff --git a/src/app/vault/vaultSubvaultsController.js b/src/app/vault/vaultSubvaultsController.js
index c97f24dd0a7..e3cd66be60f 100644
--- a/src/app/vault/vaultSubvaultsController.js
+++ b/src/app/vault/vaultSubvaultsController.js
@@ -20,7 +20,7 @@
                 $scope.subvaults = decSubvaults;
             }).$promise;
 
-            var cipherPromise = apiService.ciphers.listSubvaults({}, function (ciphers) {
+            var cipherPromise = apiService.ciphers.listDetails({}, function (ciphers) {
                 var decLogins = [];
 
                 for (var i = 0; i < ciphers.Data.length; i++) {
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index 8b5063e7289..707f1a67eb4 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -56,6 +56,11 @@
                                                 <i class="fa fa-fw fa-share-alt"></i> Share
                                             </a>
                                         </li>
+                                        <li ng-show="login.organizationId">
+                                            <a href="javascript:void(0)" ng-click="subvaults(login)">
+                                                <i class="fa fa-fw fa-share-alt"></i> Subvaults
+                                            </a>
+                                        </li>
                                         <li>
                                             <a href="javascript:void(0)" ng-click="deleteLogin(login)" class="text-red">
                                                 <i class="fa fa-fw fa-trash"></i> Delete
@@ -133,6 +138,11 @@
                                                 <i class="fa fa-fw fa-share-alt"></i> Share
                                             </a>
                                         </li>
+                                        <li ng-show="login.organizationId">
+                                            <a href="javascript:void(0)" ng-click="subvaults(login)">
+                                                <i class="fa fa-fw fa-share-alt"></i> Subvaults
+                                            </a>
+                                        </li>
                                         <li>
                                             <a href="javascript:void(0)" ng-click="deleteLogin(login)" class="text-red">
                                                 <i class="fa fa-fw fa-trash"></i> Delete
diff --git a/src/app/vault/views/vaultLoginSubvaults.html b/src/app/vault/views/vaultLoginSubvaults.html
new file mode 100644
index 00000000000..dc39b795586
--- /dev/null
+++ b/src/app/vault/views/vaultLoginSubvaults.html
@@ -0,0 +1,54 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-share-alt"></i> Subvaults <small>{{login.name}}</small></h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occured</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div ng-show="loadingSubvaults && !subvaults.length">
+            Loading...
+        </div>
+        <div ng-show="!loadingSubvaults && !subvaults.length">
+            <p>No subvaults.</p>
+        </div>
+        <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
+            <table class="table table-striped table-hover" style="margin: 0;">
+                <thead>
+                    <tr>
+                        <th style="width: 40px;">
+                            <input type="checkbox"
+                                   ng-checked="allSelected()"
+                                   ng-click="toggleSubvaultSelectionAll($event)">
+                        </th>
+                        <th>Name</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="subvault in subvaults | orderBy: ['name']">
+                        <td valign="middle">
+                            <input type="checkbox"
+                                   name="selectedSubvaults[]"
+                                   value="{{subvault.id}}"
+                                   ng-checked="subvaultSelected(subvault)"
+                                   ng-click="toggleSubvaultSelection(subvault.id)">
+                        </td>
+                        <td valign="middle">
+                            {{subvault.name}}
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Save
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 36d60fc08ba..a65bd4383fa 100644
--- a/src/index.html
+++ b/src/index.html
@@ -125,6 +125,7 @@
     <script src="app/vault/vaultAddFolderController.js"></script>
     <script src="app/vault/vaultShareController.js"></script>
     <script src="app/vault/vaultSubvaultsController.js"></script>
+    <script src="app/vault/vaultLoginSubvaultsController.js"></script>
 
     <script src="app/organization/organizationModule.js"></script>
     <script src="app/organization/organizationDashboardController.js"></script>