Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java,v
diff -u -r1.16.2.5 -r1.16.2.6
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	28 Sep 2016 15:12:46 -0000	1.16.2.5
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	15 Dec 2016 15:31:53 -0000	1.16.2.6
@@ -122,12 +122,6 @@
 
     public static String getRequestURL(HttpServletRequest request) throws ServletException {
 
-	// get the location from an explicit parameter if it exists
-	String redirect = request.getParameter("redirectURL");
-	if (redirect != null) {
-	    return request.getContextPath() + "/" + redirect;
-	}
-
 	String method = request.getParameter(PARAM_METHOD);
 	String lessonId = request.getParameter(PARAM_LESSON_ID);
 	String mode = request.getParameter(PARAM_MODE);
@@ -142,6 +136,12 @@
 	    }
 	}
 
+	// get the location from an explicit parameter if it exists
+	String redirect = request.getParameter("redirectURL");
+	if (redirect != null) {
+	    return request.getContextPath() + "/" + redirect;
+	}
+
 	if (MODE_GRADEBOOK.equals(mode)) {
 	    return request.getContextPath() + URL_GRADEBOOK + request.getQueryString();
 	}