2 files changed, 5 insertions, 0 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index ed589a3..3bb702b 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -72,6 +72,7 @@ class Admin_Users_Controller extends Admin_Controller {
       $user->full_name = $form->add_user->full_name->value;
       $user->password = $form->add_user->password->value;
       $user->email = $form->add_user->email->value;
+      $user->jabberid = $form->add_user->jabberid->value;
       $user->url = $form->add_user->url->value;
       $user->locale = $form->add_user->locale->value;
       $user->admin = $form->add_user->admin->checked;
@@ -154,6 +155,7 @@ class Admin_Users_Controller extends Admin_Controller {
       $user->email = $form->edit_user->email->value;
       $user->url = $form->edit_user->url->value;
       $user->locale = $form->edit_user->locale->value;
+      $user->jabberid = $form->edit_user->jabberid->value;
       if ($user->id != identity::active_user()->id) {
         $user->admin = $form->edit_user->admin->checked;
       }
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index ee81344..b93da8b 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -29,6 +29,7 @@ class Users_Controller extends Controller {
       $valid = $form->validate();
       $user->full_name = $form->edit_user->full_name->value;
       $user->url = $form->edit_user->url->value;
+      $user->jabberid = $form->edit_user->jabberid->value;
 
       if (count(locales::installed()) > 1 &&
           $user->locale != $form->edit_user->locale->value) {
@@ -211,6 +212,8 @@ class Users_Controller extends Controller {
     self::_add_locale_dropdown($group, $user);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url)
       ->error_messages("url", t("You must enter a valid url"));
+	$group->input("jabberid")->label(t("Jabber ID"))->id("g-jabberid")->value($user->jabberid)
+      ->error_messages("length", t("Your jabber ID is too long"));
 
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));