Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8e454f8298f642d44db16ee5ade01b0c0afde504 -r9004121c5aab7ccdf967fa5ceef247c8950e92f8
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8e454f8298f642d44db16ee5ade01b0c0afde504)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9004121c5aab7ccdf967fa5ceef247c8950e92f8)
@@ -197,14 +197,18 @@
 label.ok  =OK
 title.forgot.password  =LAMS :: Forgot Password
 label.forgot.password.confirm  =Password Request
-label.forgot.password.instructions  =Please enter your user name and email below. An email will be sent to you shortly with a link that will allow you to change your password. If you do not know your email address in LAMS, please contact your System Administrator.
+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.email  =Check Email
+label.forgot.password.username  =Check Username
 forgot.password.email.subject  =LAMS server - Forgot password response
 forgot.password.email.body  =Click the link below to and it will take you to a page where you can change your password.
 forgot.password.email.sent  =An email has been sent to your email address.
+error.forgot.password.email  =Please enter an email address.
+error.forgot.password.username  =Please enter a username.
 error.user.not.found  =Unable to find the username in LAMS. Please check your username and try again.
-error.email.does.not.match  =The email address does not match your saved email address. Please try again.
+error.email.not.found  =Unable to find a user that matches the given email. Please check your email and try again.
+error.multiple.emails  =There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your System Administrator.
 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.forgot.password.fields  =Both fields are required. Please try again.
 
 #======= End labels: Exported 199 labels for en AU =====