diff --git a/src/views/users.html b/src/views/users.html
index c58865b70..e84955345 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -108,15 +108,21 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">{{ 'users.transferOwnershipDialog.title' | tr:{ username: (transferOwnership.userInfo.username || transferOwnership.userInfo.email) } }}</h4>
+        <h4 class="modal-title">{{ 'users.transferOwnershipDialog.title' | tr }}</h4>
       </div>
       <div class="modal-body">
         <p class="text-bold text-danger" ng-show="transferOwnership.error">{{ transferOwnership.error }}</p>
-        <p ng-hide="transferOwnership.error">{{ 'users.transferOwnershipDialog.description' | tr }}</p>
+        <div class="form-group">
+          <label class="control-label">{{ 'users.transferOwnershipDialog.newOwner' | tr }}New Owner</label>
+          <div class="control-label">
+            <multiselect ng-model="transferOwnership.selectedUser" options="user.username for user in users" data-compare-by="id" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+          </div>
+        </div>
+        <p>{{ 'users.transferOwnershipDialog.description' | tr }}</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-click="transferOwnership.submit()" ng-hide="transferOwnership.error" ng-disabled="transferOwnership.busy"><i class="fa fa-circle-notch fa-spin" ng-show="transferOwnership.busy"></i> {{ 'users.transferOwnershipDialog.transferAction' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="transferOwnership.submit()" ng-hide="transferOwnership.error" ng-disabled="!transferOwnership.selectedUser || transferOwnership.busy"><i class="fa fa-circle-notch fa-spin" ng-show="transferOwnership.busy"></i> {{ 'users.transferOwnershipDialog.transferAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -501,7 +507,7 @@
                   </td>
 
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <button ng-show="userInfo.role === 'owner' && user.role !== 'owner' && !config.features.userRoles" class="btn btn-xs btn-default" ng-click="transferOwnership.show(user)" uib-tooltip="{{ 'users.users.transferOwnershipTooltip' | tr }}"><i class="fas fa-random"></i></button>
+                    <button ng-show="isMe(user) && userInfo.role === 'owner' && user.role === 'owner' && !config.features.userRoles" class="btn btn-xs btn-default" ng-click="transferOwnership.show()" uib-tooltip="{{ 'users.users.transferOwnershipTooltip' | tr }}"><i class="fas fa-random"></i></button>
                     <button ng-disabled="!canEdit(user) || isMe(user) || user.source" class="btn btn-xs btn-default" ng-click="invitation.show(user)" uib-tooltip="{{ 'users.users.resetPasswordTooltip' | tr }}"><i class="fa fa-redo"></i></button>
                     <button ng-disabled="!canEdit(user)" class="btn btn-xs btn-default" ng-click="useredit.show(user)" uib-tooltip="{{ 'users.users.editUserTooltip' | tr }}"><i class="fa fa-pencil-alt"></i></button>
                     <button ng-disabled="!canEdit(user) || isMe(user)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" uib-tooltip="{{ 'users.users.removeUserTooltip' | tr }}"><i class="far fa-trash-alt"></i></button>
diff --git a/src/views/users.js b/src/views/users.js
index 405310df5..8553fffde 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -56,11 +56,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.transferOwnership = {
         busy: false,
         error: null,
-        userInfo: {},
+        selectedUser: null,
 
-        show: function (userInfo) {
+        show: function () {
             $scope.transferOwnership.error = null;
-            $scope.transferOwnership.userInfo = userInfo;
+            $scope.transferOwnership.selectedUser = null;
 
             $('#transferOwnershipModal').modal('show');
         },
@@ -68,7 +68,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         submit: function () {
             $scope.transferOwnership.busy = true;
 
-            Client.changeOwnership($scope.transferOwnership.userInfo.id, function (error) {
+            Client.changeOwnership($scope.transferOwnership.selectedUser.id, function (error) {
                 $scope.transferOwnership.busy = false;
 
                 if (error) {