2 files changed, 4 insertions, 6 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 9ffa9929..ffd344f8 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -65,16 +65,14 @@ class group_Core {
     $form = new Forge("admin/groups/edit/$group->id");
     $form_group = $form->group("edit_group")->label(_("Edit Group"));
     $form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
-    $form_group->submit(_("Modify"));
     $form->add_rules_from($group);
     return $form;
   }
 
   public static function get_add_form_admin() {
-    $form = new Forge("admin/groups/create");
+    $form = new Forge("admin/groups/add");
     $form_group = $form->group("add_group")->label(_("Add Group"));
     $form_group->input("name")->label(_("Name"))->id("gName");
-    $form_group->submit(_("Create"));
     $group = ORM::factory("group");
     $form->add_rules_from($group);
     return $form;
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f2912a0f..1da0b8cd 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -27,7 +27,7 @@ class user_Core {
   public static function get_edit_form($user, $action = NULL) {
     $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
     $group = $form->group("edit_user")->label(_("Edit User"));
-    $group->input("uname")->label(_("Name"))->id("gName")->value($user->name);
+    $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
     $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
@@ -39,7 +39,7 @@ class user_Core {
   public static function get_edit_form_admin($user) {
     $form = new Forge("admin/users/edit/$user->id");
     $group = $form->group("edit_user")->label(_("Edit User"));
-    $group->input("uname")->label(_("Name"))->id("gName")->value($user->name);
+    $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
     $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
@@ -48,7 +48,7 @@ class user_Core {
   }
 
   public static function get_add_form_admin() {
-    $form = new Forge("admin/users/create");
+    $form = new Forge("admin/users/add");
     $group = $form->group("add_user")->label(_("Add User"));
     $group->input("name")->label(_("Name"))->id("gName");
     $group->input("full_name")->label(_("Full Name"))->id("gFullName");