Index: lams_central/web/login.jsp
===================================================================
diff -u -r815265ee039e89278f032060726fb66ed120a2a0 -rcb37a69688d194dd0be772e7193f9a6bfc548931
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 815265ee039e89278f032060726fb66ed120a2a0)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision cb37a69688d194dd0be772e7193f9a6bfc548931)
@@ -1,10 +1,12 @@
+<%@page import="org.springframework.web.context.request.SessionScope"%>
 <%@ page language="java" pageEncoding="UTF-8"
 	contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+<%@ page import="org.lamsfoundation.lams.web.session.SessionManager"%>
 
 <%-- Attributes in request come from sysadmin LoginAs action
 	 while in session from LoginRequestServlet
@@ -168,7 +170,7 @@
 	<c:otherwise>
 		<%
 			// invalidate session so a new user can be logged in
-			session.invalidate();
+			SessionManager.removeSession((String) pageContext.getAttribute("login"), true);
 		%>
 		<lams:head>
 			<lams:css/>