Index: lams_central/src/java/org/lamsfoundation/lams/web/SIFOpenIDServlet.java
===================================================================
diff -u -r82db28189db82b0d3f130a4ea58d48f32fec8b7e -rb0be934768aa56f7187986b2fd0b74fdee5ee9ce
--- lams_central/src/java/org/lamsfoundation/lams/web/SIFOpenIDServlet.java	(.../SIFOpenIDServlet.java)	(revision 82db28189db82b0d3f130a4ea58d48f32fec8b7e)
+++ lams_central/src/java/org/lamsfoundation/lams/web/SIFOpenIDServlet.java	(.../SIFOpenIDServlet.java)	(revision b0be934768aa56f7187986b2fd0b74fdee5ee9ce)
@@ -78,7 +78,10 @@
 					redirectToPortal(response, messageService.getMessage(ERROR_KEY_NO_ID_PASSED));
 
 				} else {
-					String returnURL = UrlUtils.getBaseUrl(request) + "/OpenIDServlet?lessonID=" + lessonID;
+					String returnURL = UrlUtils.getBaseUrl(request) + "/OpenIDServlet";
+					if (lessonID != null) {
+						returnURL += "?lessonID=" + lessonID;
+					}
 					sendAuthenticationRequest(response, userOpenIDURL, returnURL, UrlUtils.getBaseUrl(request));
 				}
 			} else {