diff --git a/src/main/twirl/admin/users/edit.scala.html b/src/main/twirl/admin/users/edit.scala.html
deleted file mode 100644
index 193a8c9..0000000
--- a/src/main/twirl/admin/users/edit.scala.html
+++ /dev/null
@@ -1,56 +0,0 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@html.main(if(account.isEmpty) "New User" else "Update User"){
-  @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">
-      <div class="row-fluid">
-        <div class="span6">
-          <fieldset>
-            <label for="userName"><strong>Username</strong></label>
-            <span id="error-userName" class="error"></span>
-            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-          </fieldset>
-          <fieldset>
-            <label for="password">
-              <strong>Password</strong>
-              @if(account.isDefined){
-                (Input to change password)
-              }
-            </label>
-            <span id="error-password" class="error"></span>
-            <input type="password" name="password" id="password" value="" autocomplete="off"/>
-          </fieldset>
-          <fieldset>
-            <label for="mailAddress"><strong>Mail Address</strong></label>
-            <span id="error-mailAddress" class="error"></span>
-            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-          </fieldset>
-          <fieldset>
-            <label><strong>User Type</strong></label>
-            <label for="userType_Normal">
-              <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
-            </label>
-            <label for="userType_Admin">
-              <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
-            </label>
-          </fieldset>
-          <fieldset>
-            <label><strong>URL (Optional)</strong></label>
-            <span id="error-url" class="error"></span>
-            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-          </fieldset>
-        </div>
-        <div class="span6">
-          <fieldset>
-            <label for="avatar"><strong>Image (Optional)</strong></label>
-            @helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-      </div>
-      <fieldset class="margin">
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
-        <a href="@path/admin/users" class="btn">Cancel</a>
-      </fieldset>
-    </form>
-  }
-}
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/list.scala.html b/src/main/twirl/admin/users/list.scala.html
index 6db83fd..a14a224 100644
--- a/src/main/twirl/admin/users/list.scala.html
+++ b/src/main/twirl/admin/users/list.scala.html
@@ -4,7 +4,7 @@
 @html.main("Manage Users"){
   @admin.html.menu("users"){
     <div style="text-align: right; margin-bottom: 4px;">
-      <a href="@path/admin/users/_new" class="btn">New User</a>
+      <a href="@path/admin/users/_newuser" class="btn">New User</a>
       <a href="@path/admin/users/_newgroup" class="btn">New Group</a>
     </div>
     <table class="table table-bordered table-hover">
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
new file mode 100644
index 0000000..98ae9ed
--- /dev/null
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -0,0 +1,56 @@
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+@html.main(if(account.isEmpty) "New User" else "Update User"){
+  @admin.html.menu("users"){
+    <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newuser} else {@path/admin/users/@account.get.userName/_edituser}" validate="true">
+      <div class="row-fluid">
+        <div class="span6">
+          <fieldset>
+            <label for="userName"><strong>Username</strong></label>
+            <span id="error-userName" class="error"></span>
+            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+          </fieldset>
+          <fieldset>
+            <label for="password">
+              <strong>Password</strong>
+              @if(account.isDefined){
+                (Input to change password)
+              }
+            </label>
+            <span id="error-password" class="error"></span>
+            <input type="password" name="password" id="password" value="" autocomplete="off"/>
+          </fieldset>
+          <fieldset>
+            <label for="mailAddress"><strong>Mail Address</strong></label>
+            <span id="error-mailAddress" class="error"></span>
+            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
+          </fieldset>
+          <fieldset>
+            <label><strong>User Type</strong></label>
+            <label for="userType_Normal">
+              <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
+            </label>
+            <label for="userType_Admin">
+              <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
+            </label>
+          </fieldset>
+          <fieldset>
+            <label><strong>URL (Optional)</strong></label>
+            <span id="error-url" class="error"></span>
+            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
+          </fieldset>
+        </div>
+        <div class="span6">
+          <fieldset>
+            <label for="avatar"><strong>Image (Optional)</strong></label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create User} else {Update User}"/>
+        <a href="@path/admin/users" class="btn">Cancel</a>
+      </fieldset>
+    </form>
+  }
+}
\ No newline at end of file