diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala
index af98c5a3a..3b6d00f9e 100644
--- a/src/main/scala/app/UserManagementController.scala
+++ b/src/main/scala/app/UserManagementController.scala
@@ -29,11 +29,11 @@ trait UserManagementControllerBase extends ControllerBase { self: AccountService
   )(UserEditForm.apply)
   
   get("/admin/users")(adminOnly {
-    admin.html.userlist(getAllUsers())
+    admin.users.html.list(getAllUsers())
   })
   
   get("/admin/users/_new")(adminOnly {
-    admin.html.useredit(None)
+    admin.users.html.edit(None)
   })
   
   post("/admin/users/_new", newForm)(adminOnly { form =>
@@ -43,7 +43,7 @@ trait UserManagementControllerBase extends ControllerBase { self: AccountService
   
   get("/admin/users/:userName/_edit")(adminOnly {
     val userName = params("userName")
-    admin.html.useredit(getAccountByUserName(userName))
+    admin.users.html.edit(getAccountByUserName(userName))
   })
   
   post("/admin/users/:name/_edit", editForm)(adminOnly { form =>
diff --git a/src/main/twirl/admin/useredit.scala.html b/src/main/twirl/admin/users/edit.scala.html
similarity index 96%
rename from src/main/twirl/admin/useredit.scala.html
rename to src/main/twirl/admin/users/edit.scala.html
index 4e55fea40..a048880e4 100644
--- a/src/main/twirl/admin/useredit.scala.html
+++ b/src/main/twirl/admin/users/edit.scala.html
@@ -1,7 +1,7 @@
 @(account: Option[model.Account])(implicit context: app.Context)
 @import context._
 @html.main(if(account.isEmpty) "New User" else "Update User"){
-  @menu("users"){
+  @admin.html.menu("users"){
     <form method="POST" action="@if(account.isEmpty){@path/admin/users/_new} else {@path/admin/users/@account.get.userName/_edit}" validate="true">
       <fieldset>
         <label for="userName"><strong>Username</strong></label>
diff --git a/src/main/twirl/admin/userlist.scala.html b/src/main/twirl/admin/users/list.scala.html
similarity index 95%
rename from src/main/twirl/admin/userlist.scala.html
rename to src/main/twirl/admin/users/list.scala.html
index 28a770082..bffa1618e 100644
--- a/src/main/twirl/admin/userlist.scala.html
+++ b/src/main/twirl/admin/users/list.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @import view.helpers._
 @html.main("Manage Users"){
-  @menu("users"){
+  @admin.html.menu("users"){
     <div style="text-align: right; margin-bottom: 4px;">
       <a href="@path/admin/users/_new" class="btn">New User</a>
     </div>