diff --git a/src/views/users.html b/src/views/users.html
index 39a9007d3..7a31096e6 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -501,7 +501,7 @@
                   </td>
 
                   <td class="text-right no-wrap" style="vertical-align: bottom">
-                    <button ng-show="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="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-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 e10c588a8..823c892f9 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -67,6 +67,41 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
         submit: function () {
             $scope.transferOwnership.busy = true;
+
+            // first grant other user owner role, then remove it from existing
+            var data = {
+                id: $scope.transferOwnership.userInfo.id,
+                role: 'owner'
+            };
+
+            Client.updateUser(data, function (error) {
+                if (error) {
+                    $scope.transferOwnership.busy = false;
+                    $scope.transferOwnership.error = error.message;
+                    console.error('Unable to change user role:', error);
+                    return;
+                }
+
+                data = {
+                    id: $scope.userInfo.id,
+                    role: 'user'
+                };
+
+                Client.updateUser(data, function (error) {
+                    $scope.transferOwnership.busy = false;
+
+                    if (error) {
+                        $scope.transferOwnership.error = error.message;
+                        console.error('Unable to change user role:', error);
+                        return;
+                    }
+
+                    $('#transferOwnershipModal').modal('hide');
+
+                    // current user was demoted, reload to refresh UI state
+                    window.location.reload();
+                });
+            });
         }
     };