diff --git a/core/client/views/settings/users/user.js b/core/client/views/settings/users/user.js
index 68dd2f719e..f12c93d3c8 100644
--- a/core/client/views/settings/users/user.js
+++ b/core/client/views/settings/users/user.js
@@ -7,7 +7,7 @@ var SettingsUserView = Ember.View.extend({
     
     canAssignRoles: Ember.computed.or('currentUser.isAdmin', 'currentUser.isOwner'),
 
-    canMakeOwner: Ember.computed.and('currentUser.isOwner', 'isNotOwnProfile'),
+    canMakeOwner: Ember.computed.and('currentUser.isOwner', 'isNotOwnProfile', 'controller.user.isAdmin'),
     
     rolesDropdownIsVisible: Ember.computed.and('isNotOwnProfile', 'canAssignRoles'),