diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js
index 67be489e00..e56b183310 100644
--- a/src/app/organization/organizationPeopleController.js
+++ b/src/app/organization/organizationPeopleController.js
@@ -80,13 +80,13 @@
             });
         };
 
-        $scope.edit = function (id) {
+        $scope.edit = function (orgUser) {
             var modal = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/organization/views/organizationPeopleEdit.html',
                 controller: 'organizationPeopleEditController',
                 resolve: {
-                    id: function () { return id; }
+                    orgUser: function () { return orgUser; }
                 }
             });
 
diff --git a/src/app/organization/organizationPeopleEditController.js b/src/app/organization/organizationPeopleEditController.js
index d20e2fc23a..dafa76ec5d 100644
--- a/src/app/organization/organizationPeopleEditController.js
+++ b/src/app/organization/organizationPeopleEditController.js
@@ -1,8 +1,8 @@
 angular
     .module('bit.organization')
 
-    .controller('organizationPeopleEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, id,
-        $analytics) {
+    .controller('organizationPeopleEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService,
+        orgUser, $analytics) {
         $analytics.eventTrack('organizationPeopleEditController', { category: 'Modal' });
 
         $scope.loading = true;
@@ -15,17 +15,17 @@
                 $scope.loading = false;
             });
 
-            apiService.organizationUsers.get({ orgId: $state.params.orgId, id: id }, function (user) {
+            apiService.organizationUsers.get({ orgId: $state.params.orgId, id: orgUser.id }, function (user) {
                 var collections = {};
                 if (user && user.Collections) {
-                    for (var i = 0; i < user.Collections.Data.length; i++) {
-                        collections[user.Collections.Data[i].Id] = {
-                            collectionId: user.Collections.Data[i].Id,
-                            readOnly: user.Collections.Data[i].ReadOnly
+                    for (var i = 0; i < user.Collections.length; i++) {
+                        collections[user.Collections[i].Id] = {
+                            collectionId: user.Collections[i].Id,
+                            readOnly: user.Collections[i].ReadOnly
                         };
                     }
                 }
-                $scope.email = user.Email;
+                $scope.email = orgUser.email;
                 $scope.type = user.Type;
                 $scope.accessAll = user.AccessAll;
                 $scope.selectedCollections = collections;
@@ -87,7 +87,7 @@
             $scope.submitPromise = apiService.organizationUsers.put(
                 {
                     orgId: $state.params.orgId,
-                    id: id
+                    id: orgUser.id
                 }, {
                     type: $scope.type,
                     collections: collections,
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index 0d27b2218e..4554414298 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -37,7 +37,7 @@
                                     </button>
                                     <ul class="dropdown-menu">
                                         <li>
-                                            <a href="javascript:void(0)" ng-click="edit(user.id)">
+                                            <a href="javascript:void(0)" ng-click="edit(user)">
                                                 <i class="fa fa-fw fa-pencil"></i> Edit
                                             </a>
                                         </li>
@@ -68,7 +68,7 @@
                                 <letter-avatar data="{{user.name || user.email}}"></letter-avatar>
                             </td>
                             <td>
-                                <a href="javascript:void(0)" ng-click="edit(user.id)">{{user.email}}</a>
+                                <a href="javascript:void(0)" ng-click="edit(user)">{{user.email}}</a>
                                 <i class="fa fa-unlock text-muted" ng-show="user.accessAll"
                                    title="Can Access All Items"></i>
                                 <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
diff --git a/src/index.html b/src/index.html
index d004daaab8..7edc6e27b1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -153,7 +153,6 @@
     <script src="app/organization/organizationGroupsAddController.js"></script>
     <script src="app/organization/organizationGroupsEditController.js"></script>
     <script src="app/organization/organizationGroupsUsersController.js"></script>
-    <script src="app/organization/organizationCollectionsGroupsController.js"></script>
 
     <script src="app/settings/settingsModule.js"></script>
     <script src="app/settings/settingsController.js"></script>