Merge branch 'master' into talmdal_dev

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index cc2d881e..b3284385 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -340,7 +340,7 @@ class Admin_Users_Controller extends Admin_Controller {
       ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
 
     module::event("user_add_form_admin", $user, $form);
-    $group->submit("")->value(t("Add User"));
+    $group->submit("")->value(t("Add user"));
     return $form;
   }
 
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 184ce70a..bd61def8 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -23,7 +23,7 @@ class User_Model extends ORM implements User_Definition {
   var $rules = array(
     "name" => "required|length[1,32]",
     "full_name" => "length[0,255]",
-    "email" => "valid_email|length[1,255]",
+    "email" => "required|valid_email|length[1,255]",
     "password" => "length[1,40]",
     "url" => "valid_url",
     "locale" => "length[2,10]");