Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -rc79453aa4974623c97edace65213babbae6a206f -r0147ea5176a527227609a9f457e4fca31ea4c53b
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision c79453aa4974623c97edace65213babbae6a206f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision 0147ea5176a527227609a9f457e4fca31ea4c53b)
@@ -22,6 +22,7 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.Emailer;
 import org.lamsfoundation.lams.util.FileUtilException;
 import org.lamsfoundation.lams.util.MessageService;
@@ -122,9 +123,10 @@
 
 		String SMPTServer = Configuration.get("SMTPServer");
 		String supportEmail = Configuration.get("LamsSupportEmail");
+		boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
 		User user = null;
 
-		if (SMPTServer==null||SMPTServer.equals("")||supportEmail==null||supportEmail.equals(""))
+		if (!useInternalSMTPServer &&  (SMPTServer==null||SMPTServer.equals("")) || supportEmail==null || supportEmail.equals(""))
 		{
 			// Validate SMTP not set up
 			languageKey = this.SMTP_SERVER_NOT_SET;