diff --git a/core/client/templates/user-actions-menu.hbs b/core/client/templates/user-actions-menu.hbs
index 63137db7b5..996b417fde 100644
--- a/core/client/templates/user-actions-menu.hbs
+++ b/core/client/templates/user-actions-menu.hbs
@@ -1,4 +1,4 @@
-{{#if view.parentView.rolesDropdownIsVisible}}
+{{#if view.parentView.canMakeOwner}}
 <a href="javascript:void(0);" {{action "openModal" "transfer-owner" this}}>Make Owner</a>
 {{/if}}
 {{#if view.parentView.deleteUserActionIsVisible}}
diff --git a/core/client/views/settings/users/user.js b/core/client/views/settings/users/user.js
index 14c8040f4d..68dd2f719e 100644
--- a/core/client/views/settings/users/user.js
+++ b/core/client/views/settings/users/user.js
@@ -6,6 +6,8 @@ var SettingsUserView = Ember.View.extend({
     }),
     
     canAssignRoles: Ember.computed.or('currentUser.isAdmin', 'currentUser.isOwner'),
+
+    canMakeOwner: Ember.computed.and('currentUser.isOwner', 'isNotOwnProfile'),
     
     rolesDropdownIsVisible: Ember.computed.and('isNotOwnProfile', 'canAssignRoles'),
 
@@ -17,7 +19,7 @@ var SettingsUserView = Ember.View.extend({
         }
     }),
 
-    userActionsAreVisible: Ember.computed.or('deleteUserActionIsVisible', 'rolesDropdownIsVisible')
+    userActionsAreVisible: Ember.computed.or('deleteUserActionIsVisible', 'canMakeOwner')
 
 });