Index: branches/RC/themes/default/forgotpw_confirm.tpl
===================================================================
diff -u -r8929 -r9127
--- branches/RC/themes/default/forgotpw_confirm.tpl	(.../forgotpw_confirm.tpl)	(revision 8929)
+++ branches/RC/themes/default/forgotpw_confirm.tpl	(.../forgotpw_confirm.tpl)	(revision 9127)
@@ -37,16 +37,16 @@
 												</table>
 											</td>
 										</tr>
-									</table>									
+									</table>
 									 <inp:include _Template="lang_select/lang_menu.tpl" />
 								</td>
 								<!--<td class="bgr-path"><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>-->
 							</tr>
 							<tr><td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td></tr>
 						</table>
 						<!-- path \\-->
-						
-            
+
+
 						<!-- confirm //-->
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr>
@@ -67,7 +67,7 @@
 									  	<td>&nbsp;</td>
 									  	<td><br />
 									  		<h2><inp:m_language _Phrase="lu_forgotpw_confirm_reset" /></h2>
-						           	<inp:m_language _Phrase="lu_forgotpw_confirm_text_reset" /><br /><br />
+											<inp:m_language _Phrase="lu_forgotpw_confirm_text_reset" /><br /><br />
 									  	</td>
 									  </tr>
 									  <tr>
@@ -78,26 +78,36 @@
 						        	<td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>
 						        	<td>
 						        		<img src="img/s.gif" width="1" height="5" alt="" /><br />
-						        		<FORM method="POST" NAME="addcat_confirm" ACTION="<inp:m_form_action _Form="m_forgotpw_confirm" />">
-						        		<INPUT type="submit" name="buttons[]" value="<inp:m_language _Phrase="lu_button_ok" />" class="button">
-						        		</FORM>
+
+						        		<inp2:m_if check="u_TestCodeIsValid">
+											<form method="POST" action="<inp2:m_FormAction />">
+												<input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_button_Ok"/>" class="button" />
+
+												<input type="hidden" name="user_key" value="<inp2:m_Get name="user_key"/>"/>
+												<input type="hidden" name="template_success" value="forgotpw_reset_result" />
+											</form>
+										<inp2:m_else />
+											<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
+											<br />	<br />
+											<a href="<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
+										</inp2:m_if>
 						        	</td>
 						        </tr>
 						        </FORM>
 						      </table>
 						  	</td>
-							</tr>						
+							</tr>
 						</table>
 						<!-- confirm \\-->
-						
+
 					</td>
 
 
 					<!-- white line content/right column //-->
 					<td><img src="img/s.gif" width="1" height="1" alt="" border="1" /><br /></td>
 					<!-- white line content/right column \\-->
-					
 
+
 					<!-- right column //-->
 					<td valign="top" height="100%" class="open-box">
             <inp:include _Template="misc/right_searchbox.tpl" />