Index: branches/1.2.x/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -r14274 -r14435
--- branches/1.2.x/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 14274)
+++ branches/1.2.x/platform/mailing_list/subscribe.tpl	(.../subscribe.tpl)	(revision 14435)
@@ -44,6 +44,7 @@
 					<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>
Index: branches/1.2.x/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -r14274 -r14435
--- branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 14274)
+++ branches/1.2.x/platform/mailing_list/unsubscribe.tpl	(.../unsubscribe.tpl)	(revision 14435)
@@ -44,6 +44,7 @@
 					<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>
Index: branches/1.2.x/platform/login/register.tpl
===================================================================
diff -u -r14274 -r14435
--- branches/1.2.x/platform/login/register.tpl	(.../register.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/register.tpl	(.../register.tpl)	(revision 14435)
@@ -78,7 +78,7 @@
 						<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"/>