Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
===================================================================
diff -u -reed8c9ab647229fb34fdadf6465dac729cf3dd87 -r9f3585678c13434e1f3111a8a8cc95d4404e4b64
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java	(.../LoginRequestServlet.java)	(revision eed8c9ab647229fb34fdadf6465dac729cf3dd87)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java	(.../LoginRequestServlet.java)	(revision 9f3585678c13434e1f3111a8a8cc95d4404e4b64)
@@ -21,7 +21,6 @@
 package org.lamsfoundation.lams.web;
 
 import java.io.IOException;
-import java.net.URLEncoder;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -231,8 +230,8 @@
 	    UniversalLoginModule.setAuthenticationToken(token);
 
 	    redirectURL = WebUtil.getBaseServerURL() + redirectURL;
-	    redirectURL = URLEncoder.encode(redirectURL, "UTF-8");
-	    response.sendRedirect("login.jsp?redirectURL=" + redirectURL);
+	    hses.setAttribute("redirectURL", redirectURL);
+	    response.sendRedirect("login.jsp");
 	} catch (AuthenticationException e) {
 	    log.error("Authentication error: ", e);
 	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,