diff --git a/core/client/templates/user-actions-menu.hbs b/core/client/templates/-user-actions-menu.hbs
similarity index 68%
rename from core/client/templates/user-actions-menu.hbs
rename to core/client/templates/-user-actions-menu.hbs
index 1b6afd1d97..45b4a12a4a 100644
--- a/core/client/templates/user-actions-menu.hbs
+++ b/core/client/templates/-user-actions-menu.hbs
@@ -1,6 +1,6 @@
-{{#if view.parentView.canMakeOwner}}
+{{#if view.canMakeOwner}}
 <li><button {{action "openModal" "transfer-owner" this}}>Make Owner</button></li>
 {{/if}}
-{{#if view.parentView.deleteUserActionIsVisible}}
+{{#if view.deleteUserActionIsVisible}}
 <li><button {{action "openModal" "delete-user" this}} class="delete">Delete User</button></li>
 {{/if}}
\ No newline at end of file
diff --git a/core/client/templates/settings/users/user.hbs b/core/client/templates/settings/users/user.hbs
index 7e17f51eab..723e8e91b9 100644
--- a/core/client/templates/settings/users/user.hbs
+++ b/core/client/templates/settings/users/user.hbs
@@ -1,17 +1,17 @@
 <header class="settings-subview-header">
     {{#unless session.user.isAuthor}}
-        {{#link-to "settings.users" class="button has-icon users-back" tagName="button"}}<i class="icon-chevron-left"></i>Users{{/link-to}}
+        {{#link-to "settings.users" class="btn btn-default btn-back" tagName="button"}}<i class="icon-chevron-left"></i>Users{{/link-to}}
     {{/unless}}
     <h2 class="page-title">{{user.name}}</h2>
     <section class="page-actions">
         {{#if view.userActionsAreVisible}}
             <span class="dropdown">
-                {{#gh-popover-button popoverName="user-actions-menu" classNames="button only-has-icon user-actions-cog" title="User Actions"}}
+                {{#gh-popover-button popoverName="user-actions-menu" classNames="btn btn-default only-has-icon user-actions-cog" title="User Actions"}}
                     <i class="icon-settings"></i>
                     <span class="hidden">User Settings</span>
                 {{/gh-popover-button}}
                 {{#gh-popover name="user-actions-menu" tagName="ul" classNames="user-actions-menu dropdown-menu dropdown-triangle-top-right"}}
-                    {{render "user-actions-menu" model}}
+                    {{partial "user-actions-menu"}}
                 {{/gh-popover}}
             </span>
         {{/if}}
@@ -115,4 +115,4 @@
 
     </fieldset>
 
-</form>
\ No newline at end of file
+</form>