Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.1.sql	(revision 7704)
@@ -0,0 +1,4 @@
+INSERT INTO ConfigurationValues VALUES (NULL, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('RegistrationCaptcha', 'la_Text_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0);
+
+ALTER TABLE EmailMessage ADD `Subject` TINYTEXT NULL ;
\ No newline at end of file
Index: trunk/admin/install/upgrades/inportal_upgrade_4_0_1.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_4_0_1.sql	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_4_0_1.sql	(revision 7704)
@@ -0,0 +1,2 @@
+INSERT INTO ConfigurationValues VALUES (NULL, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('RegistrationCaptcha', 'la_Text_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0);
\ No newline at end of file
Index: trunk/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -N -r7697 -r7704
--- trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7697)
+++ trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7704)
@@ -27,7 +27,6 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
Index: trunk/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -N -r7697 -r7704
--- trunk/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7697)
+++ trunk/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7704)
@@ -59,16 +59,16 @@
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+<table class="edit-form">
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>
 
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r7635 -r7704
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 7635)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 7704)
@@ -463,6 +463,9 @@
                $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']);
                $ip = $_SERVER['REMOTE_ADDR'];
 
+               $application =& kApplication::Instance();
+               $application->SetVar('user_password', $password);
+               SetVar('user_password', $password);
                $fields_hash	= Array('Login'		=>	$_POST['username'],
                						'Password'	=>	md5($password),
                						'FirstName'	=>	$_POST['firstname'],
@@ -522,9 +525,9 @@
 	              	}
 	              	else
 	              	{
-                   		$doLoginNow = true;
-	              		$u->SendUserEventMail("USER.ADD",$u->Get("PortalUserId"));
-                   		$u->SendAdminEventMail("USER.ADD");
+                 		$doLoginNow = true;
+              			$u->SendUserEventMail("USER.ADD",$u->Get("PortalUserId"));
+                 		$u->SendAdminEventMail("USER.ADD");
 	              	}
                  }
                  else
Index: trunk/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -N -r7697 -r7704
--- trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 7697)
+++ trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 7704)
@@ -28,7 +28,6 @@
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
 </table>