diff --git a/src/js/client.js b/src/js/client.js
index e76bf8c27..a3b939cd5 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -961,11 +961,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         });
     };
 
-    Client.prototype.removeGroup = function (groupId, password, callback) {
+    Client.prototype.removeGroup = function (groupId, callback) {
         var config = {
-            data: {
-                password: password
-            },
+            data: {},
             headers: {
                 'Content-Type': 'application/json'
             }
@@ -1298,11 +1296,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         });
     };
 
-    Client.prototype.removeUser = function (userId, password, callback) {
+    Client.prototype.removeUser = function (userId, callback) {
         var config = {
-            data: {
-                password: password
-            },
+            data: {},
             headers: {
                 'Content-Type': 'application/json'
             }
diff --git a/src/views/users.html b/src/views/users.html
index 6295c0c6f..e5a2409cf 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -70,31 +70,19 @@
 
 <!-- Modal remove user -->
 <div class="modal fade" id="userRemoveModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Delete user {{ userremove.userInfo.username || userremove.userInfo.email }}</h4>
-            </div>
-            <div class="modal-body">
-                <form name="userremove_form" role="form" ng-submit="userremove.submit()" autocomplete="off">
-                    <input type="password" style="display: none;">
-                    <div class="form-group" ng-class="{ 'has-error': (userremove_form.password.$dirty && userremove_form.password.$invalid) || (!userremove_form.password.$dirty && userremove.error.password)}">
-                        <label class="control-label">Give your password to verify this action</label>
-                        <input type="password" class="form-control" ng-model="userremove.password" id="inputUserRemovePassword" name="password" placeholder="Your Password" required autofocus>
-                        <div class="control-label" ng-show="(!userremove_form.password.$dirty && userremove.error.password) || (userremove_form.password.$dirty && userremove_form.password.$invalid)">
-                            <small ng-show="userremove_form.password.$error.required && !userremove.error.password">A password is required</small>
-                            <small ng-show="!useradd_form.email.$dirty && userremove.error.password">{{ userremove.error.password }}</small>
-                        </div>
-                    </div>
-                    <input class="hide" type="submit" ng-disabled="userremove_form.$invalid || userremove.busy"/>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-danger" ng-click="userremove.submit()" ng-disabled="userremove_form.$invalid || userremove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="userremove.busy"></i> Delete</button>
-            </div>
-        </div>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Delete user {{ userremove.userInfo.username || userremove.userInfo.email }}</h4>
+      </div>
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-danger" ng-click="userremove.submit()" ng-disabled="userremove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="userremove.busy"></i> Delete</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <!-- Modal edit user -->
@@ -225,37 +213,24 @@
 
 <!-- Modal remove group -->
 <div class="modal fade" id="groupRemoveModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Delete group {{ groupRemove.group.name }}</h4>
-            </div>
-            <div class="modal-body">
-                <div ng-show="groupRemove.memberCount" class="text-danger">
-                    <b>This group still has {{ groupRemove.memberCount }} member(s). Are you sure this group is not used?</b>
-                    <br/>
-                    <br/>
-                </div>
-
-                <form name="groupRemoveForm" role="form" novalidate ng-submit="groupRemove.submit()" autocomplete="off">
-                    <input type="password" style="display: none;">
-                    <div class="form-group" ng-class="{ 'has-error': (groupRemoveForm.password.$dirty && groupRemoveForm.password.$invalid) || (!groupRemoveForm.password.$dirty && groupRemove.error.password)}">
-                        <label class="control-label" for="groupRemovePasswordInput">Give your password to verify this action</label>
-                        <div class="control-label" ng-show="(!groupRemoveForm.password.$dirty && groupRemove.error.password) || (groupRemoveForm.password.$dirty && groupRemoveForm.password.$invalid)">
-                            <small ng-show="groupRemoveForm.password.$error.required && !groupRemove.error.password">A password is required</small>
-                            <small ng-show="!groupRemoveForm.password.$dirty && groupRemove.error.password">{{ groupRemove.error.password }}</small>
-                        </div>
-                        <input type="password" class="form-control" ng-model="groupRemove.password" id="groupRemovePasswordInput" name="password" placeholder="Password" required autofocus>
-                    </div>
-                    <input class="hide" type="submit" ng-disabled="groupRemoveForm.$invalid || groupRemove.busy"/>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-danger" ng-click="groupRemove.submit()" ng-disabled="groupRemoveForm.$invalid || groupRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="groupRemove.busy"></i> Delete</button>
-            </div>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Delete group {{ groupRemove.group.name }}</h4>
+      </div>
+      <div class="modal-body">
+        <div ng-show="groupRemove.memberCount" class="text-danger">
+          <b>This group still has {{ groupRemove.memberCount }} member(s). Are you sure this group is not used?</b>
+          <br/>
+          <br/>
         </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-danger" ng-click="groupRemove.submit()" ng-disabled="groupRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="groupRemove.busy"></i> Delete</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <!-- Modal invite -->
diff --git a/src/views/users.js b/src/views/users.js
index a2f840672..2529ee376 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -35,46 +35,27 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         busy: false,
         error: {},
         userInfo: {},
-        password: '',
 
         show: function (userInfo) {
             $scope.userremove.error.username = null;
-            $scope.userremove.error.password = null;
-            $scope.userremove.password = '';
             $scope.userremove.userInfo = userInfo;
 
-            $scope.userremove_form.$setPristine();
-            $scope.userremove_form.$setUntouched();
-
             $('#userRemoveModal').modal('show');
         },
 
         submit: function () {
-            $scope.userremove.error.password = null;
             $scope.userremove.busy = true;
 
             // transfer to self for now. not transferred to owner because this user probably wants to "manage" it immediately
-            // FIXME: this may awkwardly transfer resources but fail with incorrect password
             Client.transferOwnership($scope.userremove.userInfo.id, $scope.userInfo.id, function (error) {
                 if (error) return console.error('Unable to transfer resources.', error);
 
-                Client.removeUser($scope.userremove.userInfo.id, $scope.userremove.password, function (error) {
+                Client.removeUser($scope.userremove.userInfo.id, function (error) {
                     $scope.userremove.busy = false;
 
-                    if (error && error.statusCode === 403) {
-                        $scope.userremove.error.password = 'Wrong password';
-                        $scope.userremove.password = '';
-                        $scope.userremove_form.password.$setPristine();
-                        $('#inputUserRemovePassword').focus();
-                        return;
-                    }
                     if (error) return console.error('Unable to delete user.', error);
 
                     $scope.userremove.userInfo = {};
-                    $scope.userremove.password = '';
-
-                    $scope.userremove_form.$setPristine();
-                    $scope.userremove_form.$setUntouched();
 
                     refresh();
 
@@ -367,20 +348,15 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         busy: false,
         error: {},
         group: null,
-        password: '',
         memberCount: 0,
 
         show: function (group) {
             $scope.groupRemove.busy = false;
 
             $scope.groupRemove.error = {};
-            $scope.groupRemove.password = '';
 
             $scope.groupRemove.group = angular.copy(group);
 
-            $scope.groupRemoveForm.$setUntouched();
-            $scope.groupRemoveForm.$setPristine();
-
             Client.getGroup(group.id, function (error, result) {
                 if (error) return console.error('Unable to fetch group information.', error.statusCode, error.message);
 
@@ -394,16 +370,9 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.groupRemove.busy = true;
             $scope.groupRemove.error = {};
 
-            Client.removeGroup($scope.groupRemove.group.id, $scope.groupRemove.password, function (error) {
+            Client.removeGroup($scope.groupRemove.group.id, function (error) {
                 $scope.groupRemove.busy = false;
 
-                if (error && error.statusCode === 403) {
-                    $scope.groupRemove.error.password = 'Wrong password';
-                    $scope.groupRemove.password = '';
-                    $scope.groupRemoveForm.password.$setPristine();
-                    $('#groupRemovePasswordInput').focus();
-                    return;
-                }
                 if (error) return console.error('Unable to remove group.', error.statusCode, error.message);
 
                 refresh();