Index: lams_central/web/login.jsp
===================================================================
diff -u -r131ce42e64069f574a2a4a9bc1e5c4be4918e5bb -r42c6da4ecec87cbdf2b5a7247abca9c918183b8e
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 131ce42e64069f574a2a4a9bc1e5c4be4918e5bb)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 42c6da4ecec87cbdf2b5a7247abca9c918183b8e)
@@ -176,11 +176,12 @@
 				// invalidate session so a new user can be logged in
 				HttpSession hs = SessionManager.getSession();
 				if (hs != null) {
-				    // maybe this attribute removal is not necessary
-				    // since we invalidate the session right after it
-				    hs.removeAttribute("login");
-				    hs.removeAttribute("password");
-				    hs.invalidate();
+					UserDTO userDTO = (UserDTO) hs.getAttribute("user");
+					if (userDTO != null) {
+					    // remove session from mapping
+					    SessionManager.removeSessionByLogin(userDTO.getLogin(), false);
+					}
+					hs.invalidate();
 				}
 			%>
 			<script type="text/javascript">