Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r666fb04f2c0a0fba205a3efb7c0fc64680aeefcc -rac485a5e717405733d6505426f960231a1b4e0cb
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 666fb04f2c0a0fba205a3efb7c0fc64680aeefcc)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ac485a5e717405733d6505426f960231a1b4e0cb)
@@ -192,12 +192,13 @@
 label.lesson.sorting.enabled  =lesson sorting enabled
 label.show.groups  =Show Groups
 error.newpassword.mismatch  =Your new passwords do not match each other.
-label.forgot.password  =Forgot your password?
 error.general.1  =Sorry, there has been an error.
 label.ok  =OK
+label.forgot.password  =Forgot your password?
 title.forgot.password  =LAMS :: Forgot Password
 label.forgot.password.confirm  =Password Request
-label.forgot.password.instructions  =Please enter your user name <b>or</b> email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.<br><br>If you do not know your email address in LAMS, please contact your System Administrator.
+label.forgot.password.instructions.1  =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.
+label.forgot.password.instructions.2  =If you do not know your email address in LAMS, please contact your System Administrator.
 label.forgot.password.email  =Check Email
 label.forgot.password.username  =Check Username
 forgot.password.email.subject  =LAMS server - Forgot password response
@@ -211,5 +212,6 @@
 error.support.email.not.set  =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator.
 error.password.request.expired  =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
 error.email.not.sent  =Server failed to send email to recipient. Please contact your System Administrator.
+error.forgot.password.fields  =Both fields are required. Please try again.
 
 #======= End labels: Exported 199 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r666fb04f2c0a0fba205a3efb7c0fc64680aeefcc -rac485a5e717405733d6505426f960231a1b4e0cb
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 666fb04f2c0a0fba205a3efb7c0fc64680aeefcc)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision ac485a5e717405733d6505426f960231a1b4e0cb)
@@ -192,12 +192,13 @@
 label.lesson.sorting.enabled  =lesson sorting enabled
 label.show.groups  =Show Groups
 error.newpassword.mismatch  =Your new passwords do not match each other.
-label.forgot.password  =Forgot your password?
 error.general.1  =Sorry, there has been an error.
 label.ok  =OK
+label.forgot.password  =Forgot your password?
 title.forgot.password  =LAMS :: Forgot Password
 label.forgot.password.confirm  =Password Request
-label.forgot.password.instructions  =Please enter your user name <b>or</b> email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.<br><br>If you do not know your email address in LAMS, please contact your System Administrator.
+label.forgot.password.instructions.1  =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.
+label.forgot.password.instructions.2  =If you do not know your email address in LAMS, please contact your System Administrator.
 label.forgot.password.email  =Check Email
 label.forgot.password.username  =Check Username
 forgot.password.email.subject  =LAMS server - Forgot password response
@@ -211,5 +212,6 @@
 error.support.email.not.set  =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator.
 error.password.request.expired  =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
 error.email.not.sent  =Server failed to send email to recipient. Please contact your System Administrator.
+error.forgot.password.fields  =Both fields are required. Please try again.
 
 #======= End labels: Exported 199 labels for en AU =====
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -r9004121c5aab7ccdf967fa5ceef247c8950e92f8 -rac485a5e717405733d6505426f960231a1b4e0cb
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 9004121c5aab7ccdf967fa5ceef247c8950e92f8)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision ac485a5e717405733d6505426f960231a1b4e0cb)
@@ -18,7 +18,6 @@
     <link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 <script language="javascript" type="text/javascript">
 <!--        
-        
         function toHome() {window.location="<lams:LAMSURL/>index.do";};
         
         function validateForm()
@@ -39,8 +38,9 @@
             else if (document.forgotForm.selectType[1].checked)
             {
                 var email = document.forgotForm.email.value;
-                var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-                
+                //var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+                var filter = /^(.)+\@(.)+\.(.)+/;
+               
                 if (email == null || email=="")
                 {
                     alert('<fmt:message key="error.forgot.password.email" />');
@@ -107,7 +107,9 @@
 		<div id="header-no-tabs"></div>
 		<div id="content">
 		            <table border="0"><tr><td>
-		            <fmt:message key="label.forgot.password.instructions"/>
+		            <fmt:message key="label.forgot.password.instructions.1"/>
+		            <br><br>
+		            <fmt:message key="label.forgot.password.instructions.2"/>
 		            </td></tr></table>
 		            
 		            <table border="0">
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
diff -u -r8e454f8298f642d44db16ee5ade01b0c0afde504 -rac485a5e717405733d6505426f960231a1b4e0cb
--- lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
+++ lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision ac485a5e717405733d6505426f960231a1b4e0cb)
@@ -14,6 +14,7 @@
 <%
 String languageKey = request.getParameter("languageKey");
 String stateStr = request.getParameter("state");
+String emailStr = request.getParameter("emailSent");
 %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -52,7 +53,16 @@
 	    <table border="0" class="body"><tr><td>
 		    <%if (stateStr.equals("0")){out.print("<font color='Red'>");}%>
 		    <fmt:message key="<%=languageKey %>"/>
-		    <%if (stateStr.equals("0")){out.print("</font>");}%>
+		    <%
+		    if (stateStr.equals("0"))
+		    {
+		    	out.print("</font>");
+		    }
+		    else if (emailStr!=null && !emailStr.equals(""))
+		    {
+		    	out.print(emailStr);
+		    }
+		    %>
 	    </td></tr></table>
 	    <br><br>
 	    <html:button property="cancel" styleClass="button" onclick="javascript:toHome();"><fmt:message key="label.ok"/></html:button>