diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala
index 2b2b9d7..7544ee5 100644
--- a/src/main/scala/app/UserManagementController.scala
+++ b/src/main/scala/app/UserManagementController.scala
@@ -61,22 +61,22 @@
     admin.users.html.list(users, members)
   })
   
-  get("/admin/users/_new")(adminOnly {
-    admin.users.html.edit(None)
+  get("/admin/users/_newuser")(adminOnly {
+    admin.users.html.user(None)
   })
   
-  post("/admin/users/_new", newUserForm)(adminOnly { form =>
+  post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
     createAccount(form.userName, sha1(form.password), form.mailAddress, form.isAdmin, form.url)
     updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
   
-  get("/admin/users/:userName/_edit")(adminOnly {
+  get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    admin.users.html.edit(getAccountByUserName(userName))
+    admin.users.html.user(getAccountByUserName(userName))
   })
   
-  post("/admin/users/:name/_edit", editUserForm)(adminOnly { form =>
+  post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
       updateAccount(getAccountByUserName(userName).get.copy(