Index: branches/1.2.x/platform/login/register.tpl
===================================================================
--- branches/1.2.x/platform/login/register.tpl	(revision 14434)
+++ branches/1.2.x/platform/login/register.tpl	(revision 14435)
@@ -1,112 +1,112 @@
 <!--##
 <NAME>User Registration</NAME>
 <DESC></DESC>
 <SECTION>My Account||Login</SECTION>
 ##-->
 
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_UserRegistration" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration" templates="platform/login/register"/>
 		</div>
 		<div class="movable-element">
 			<!-- user registration -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_UserRegistration"/>
 				</inp2:m_Capture>
 
 				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
 				<inp2:u_PresetFormFields/>
 				<inp2:m_if check="u_HasError" field="any">
 					<inp2:m_RenderElement name="error_message" />
 				</inp2:m_if>
 
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
 						<inp2:m_if check="u_UseUsernames">
 							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
 							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
 							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 						</inp2:m_if>
 
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
 
 						<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
-							<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="UserGroup" has_empty="1" title="lu_fld_UserGroup" />
+							<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="PrimaryGroupId" title="lu_fld_UserGroup" />
 						</inp2:m_if>
 
 						<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
 
 						<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
 							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 							<inp2:m_RenderElement name="inp_edit_captcha" prefix="u" style="width: 170px;" />
 						</inp2:m_if>
 
 						<inp2:m_ModuleInclude template="elements/registration_fields.elm"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons" no_editing="1">
 							<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
 							<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
 							<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
 
 							<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
 							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
 						</inp2:m_RenderElement>
 					</table>
 				</form>
 			</inp2:m_RenderElement>
 			<!-- // user registration -->
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.2.x/platform/mailing_list/subscribe.tpl
===================================================================
--- branches/1.2.x/platform/mailing_list/subscribe.tpl	(revision 14434)
+++ branches/1.2.x/platform/mailing_list/subscribe.tpl	(revision 14435)
@@ -1,53 +1,54 @@
 <!--##
 <NAME>Subscribe</NAME>
 <DESC></DESC>
 <SECTION>Platform||Mailing</SECTION>
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_SubscribeConfirm" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
 				</inp2:m_Capture>
 
 				<inp2:m_Phrase label="lu_subscribe_confirm_prompt" />
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
 					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
+					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
 				</form>
 			</inp2:m_RenderElement>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/platform/mailing_list/unsubscribe.tpl
===================================================================
--- branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(revision 14434)
+++ branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(revision 14435)
@@ -1,53 +1,54 @@
 <!--##
 <NAME>Unsubscribe</NAME>
 <DESC>Unsubscribe from mailing list</DESC>
 <SECTION>Platform||Mailing</SECTION>
 ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_UnsubscribeConfirm" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
 
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
 			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
 					<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
 				</inp2:m_Capture>
 
 				<inp2:m_Phrase label="lu_unsubscribe_confirm_prompt" />
 				<br /><br />
 
 				<form method="POST" action="<inp2:m_FormAction />">
 					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
 					<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
+					<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
 				</form>
 			</inp2:m_RenderElement>
 		</div>
 	</div>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file