Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -r65ed3834599c7868a2f7948a02500b28b071b579 -rb53d1132ca14c7e04df4a479cd6c94e8ce86100f
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision b53d1132ca14c7e04df4a479cd6c94e8ce86100f)
@@ -59,7 +59,7 @@
 
     private static int MILLISECONDS_IN_A_DAY = 86400000;
 
-    private static String LANGUAGE_KEY = "&languageKey=";
+    private static String LANGUAGE_KEY = "languageKey";
 
     /*
      * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans
@@ -93,12 +93,12 @@
 	    } else {
 		param = request.getParameter("login");
 	    }
-	    handleEmailRequest(findByEmail, param.trim(), response);
+	    handleEmailRequest(findByEmail, param.trim(), request, response);
 
 	} else if (method.equals("requestPasswordChange")) {
 	    String newPassword = request.getParameter("newPassword");
 	    String key = request.getParameter("key");
-	    handlePasswordChange(newPassword, key, response);
+	    handlePasswordChange(newPassword, key, request, response);
 
 	} else {
 	    response.sendError(HttpServletResponse.SC_BAD_REQUEST);
@@ -117,8 +117,8 @@
      * @throws ServletException
      * @throws IOException
      */
-    public void handleEmailRequest(Boolean findByEmail, String param, HttpServletResponse response)
-	    throws ServletException, IOException {
+    public void handleEmailRequest(Boolean findByEmail, String param, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException, IOException {
 	if ((param == null) || param.equals("")) {
 	    response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 	    return;
@@ -210,10 +210,10 @@
 	//show default message if there is no error message
 	languageKey = languageKey == null ? ForgotPasswordServlet.REQUEST_PROCESSED : languageKey;
 
-	String redirectUrl = Configuration.get("ServerURL") + "forgotPasswordProc.jsp?"
-		+ ForgotPasswordServlet.LANGUAGE_KEY + languageKey + "&showErrorMessage=" + showErrorMessage;
+	request.setAttribute(ForgotPasswordServlet.LANGUAGE_KEY, languageKey);
+	request.setAttribute("showErrorMessage", showErrorMessage);
+	request.getRequestDispatcher("/forgotPasswordProc.jsp").forward(request, response);
 
-	response.sendRedirect(redirectUrl);
     }
 
     /**
@@ -222,10 +222,8 @@
      * @param key
      *            the key of the forgot password request
      */
-    public void handlePasswordChange(String newPassword, String key, HttpServletResponse response)
-	    throws ServletException, IOException {
-	int success = 0;
-
+    public void handlePasswordChange(String newPassword, String key, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException, IOException {
 	if ((key == null) || key.equals("") || (newPassword == null) || newPassword.equals("")) {
 	    response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 	    return;
@@ -256,9 +254,9 @@
 	    userManagementService.delete(fp);
 	}
 
-	String redirectUrl = Configuration.get("ServerURL") + "forgotPasswordProc.jsp?"
-		+ ForgotPasswordServlet.LANGUAGE_KEY + languageKey + "&showErrorMessage=" + showErrorMessage;
-	response.sendRedirect(response.encodeRedirectURL(redirectUrl));
+	request.setAttribute(ForgotPasswordServlet.LANGUAGE_KEY, languageKey);
+	request.setAttribute("showErrorMessage", showErrorMessage);
+	request.getRequestDispatcher("/forgotPasswordProc.jsp").forward(request, response);
     }
 
     /**
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rb53d1132ca14c7e04df4a479cd6c94e8ce86100f
--- lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision b53d1132ca14c7e04df4a479cd6c94e8ce86100f)
@@ -19,7 +19,7 @@
 	<c:set var="title"><fmt:message key="title.forgot.password" /></c:set>
 	<lams:Page type="admin" title="${title}">
 		<c:choose>
-			<c:when test="${param.showErrorMessage}">
+			<c:when test="${showErrorMessage}">
 				<c:set var="type" value="danger"/>
 			</c:when>
 			<c:otherwise>
@@ -28,7 +28,7 @@
 		</c:choose>
 		
 		<lams:Alert id="output" type="${type}" close="false">
-			<fmt:message key="${param.languageKey}" />
+			<fmt:message key="${languageKey}" />
 		</lams:Alert>
 
 		<button type="button" name="cancel" class="btn btn-primary pull-right voffset10" onclick="javascript:toHome();">