Index: branches/RC/themes/default/forgotpw.tpl
===================================================================
diff -u -r8929 -r9127
--- branches/RC/themes/default/forgotpw.tpl	(.../forgotpw.tpl)	(revision 8929)
+++ branches/RC/themes/default/forgotpw.tpl	(.../forgotpw.tpl)	(revision 9127)
@@ -43,9 +43,9 @@
 							</tr>
 						</table>
 						<!-- end bred crumbles -->
-            
+
             <img src="img/s.gif" width="1" height="1" alt="" /><br />
-						
+
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr>
 								<td><img src="img/s.gif" width="20" height="1" alt="" /><br /></td>
@@ -83,42 +83,65 @@
 										</tr>
 										<tr>
 											<td colspan="4">
-                        <FORM method="POST" NAME="login" ACTION="<inp:m_form_action _form="forgotpw" _Confirm="forgotpw_confirm"/>">
+                        						<form method="post" action="<inp2:m_FormAction/>">
 												<table width="98%" border="0" cellspacing="0" cellpadding="0">
-													<tr>														
+													<tr>
 														<td valign="top" width="10000">
 															<table width="100%" border="0" cellspacing="0" cellpadding="0">
 																<tr>
-																	<td colspan="3" class="field-content-top"><h2><inp:m_language _Phrase="lu_forgot_password" /></h2></td>																	
+																	<td colspan="3" class="field-content-top"><h2><inp:m_language _Phrase="lu_forgot_password" /></h2></td>
 																</tr>
 																<tr>
-																	<td colspan="3" class="field-content-top"><span class="text"><inp:m_language _Phrase="lu_forgot_pw_description" /></td>																	
-																</tr>																
-										            <tr>
-											            <td colspan="3" class="error"><inp:m_list_form_errors _Form="forgotpw" _ItemTemplate="misc/form_error.tpl" /></td>
-										            </tr>
+																	<td colspan="3" class="field-content-top"><span class="text"><inp:m_language _Phrase="lu_forgot_pw_description" /></td>
+																</tr>
 																<tr>
-																	<td class="field-name"><inp:m_form_prompt _field="username" _Form="forgotpw" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /></td>
-																	<td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="username" _Form="login" _Required="0" /><br /></td>
+																	<td class="field-name">
+																		<inp2:m_if check="u_HasError" field="Login">
+																			<span class="error"><inp2:m_Phrase name="lu_prompt_username"/>:</span>
+																		<inp2:m_else/>
+																			<inp2:m_Phrase name="lu_prompt_username"/>:
+																		</inp2:m_if>
+																	</td>
+																	<td width="100%" class="field-content-input">
+																		<inp2:m_if check="u_HasError" field="Login">
+																			<span class="error"><inp2:u_Error field="Login"/></span><br />
+																		</inp2:m_if>
+																		<input type="text" class="input" name="username" value="<inp2:m_Get name="username"/>" style="width:135px;"/>
+																	</td>
 																	<td>&nbsp;</td>
 																</tr>
-                                <tr>
-                                  <td class="field-name"><inp:m_language _Phrase="lu_or" /></td>
-                                  <td>&nbsp;</td>
-                                  <td>&nbsp;</td>
-                                </tr>
+								                                <tr>
+								                                  <td class="field-name"><inp:m_language _Phrase="lu_or" /></td>
+								                                  <td>&nbsp;</td>
+								                                  <td>&nbsp;</td>
+								                                </tr>
 																<tr>
-																	<td class="field-name"><inp:m_form_prompt _form="forgotpw" _Field="email" _langtext="lu_pp_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /></td>
-																	<td class="field-content-input"><inp:m_form_input type="text" class="input" _field="email" _Form="login" style="width:135px;" /><br /></td>
-                                  <td>&nbsp;</td>
+																	<td class="field-name">
+																		<inp2:m_if check="u_HasError" field="Email">
+																			<span class="error"><inp2:m_Phrase name="lu_pp_email"/>:</span>
+																		<inp2:m_else/>
+																			<inp2:m_Phrase name="lu_pp_email"/>:
+																		</inp2:m_if>
+																	</td>
+																	<td class="field-content-input">
+																		<inp2:m_if check="u_HasError" field="Email">
+																			<span class="error"><inp2:u_Error field="Email"/></span><br />
+																		</inp2:m_if>
+																		<input type="text" class="input" name="email" value="<inp2:m_Get name="email"/>" style="width: 135px;">
+																	</td>
+                                  									<td>&nbsp;</td>
 																</tr>
 																<tr>
 																	<td class="field-name">&nbsp;</td>
 																	<td class="field-content" valign="top">
 																		<img src="img/s.gif" width="1" height="15" alt="" /><br />
-																		<INPUT type="submit" name="login" value="<inp:m_language _Phrase="lu_button_forgotpw" />" class="button">
+
+																		<input type="hidden" name="template_success" value="index"/>
+																		<input type="hidden" name="reset_confirm_template" value="forgotpw_confirm"/>
+
+																		<input type="submit" class="button" name="events[u][OnForgotPassword]" value="<inp2:m_Phrase label="lu_button_forgotpw"/>" />
 																	</td>
-                                <td>&nbsp;</td>
+                                									<td>&nbsp;</td>
 																</tr>
 																<tr>
 																	<td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>