diff --git a/src/app/organization/organizationPeopleEditController.js b/src/app/organization/organizationPeopleEditController.js
index 81866796c27..42de6b5a281 100644
--- a/src/app/organization/organizationPeopleEditController.js
+++ b/src/app/organization/organizationPeopleEditController.js
@@ -69,6 +69,7 @@
             return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length;
         };
 
+        $scope.submitPromise = null;
         $scope.submit = function (model) {
             var subvaults = [];
             for (var subvaultId in $scope.selectedSubvaults) {
@@ -77,12 +78,12 @@
                 }
             }
 
-            apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, {
+            $scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, {
                 type: $scope.type,
                 subvaults: subvaults
             }, function () {
                 $uibModalInstance.close();
-            });
+            }).$promise;
         };
 
         $scope.close = function () {
diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html
index 0bdc028e811..50a7f404a26 100644
--- a/src/app/organization/views/organizationPeopleEdit.html
+++ b/src/app/organization/views/organizationPeopleEdit.html
@@ -4,6 +4,12 @@
 </div>
 <form name="form" ng-submit="form.$valid && submit()" 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>
         <h4>User Type</h4>
         <div class="form-group">
             <div class="radio">