Index: lams_central/web/login.jsp
===================================================================
diff -u -rec8852a3b210bda6bc32e99a177f4767dca7d8ee -reb0982fcbbcac3092ad52a1b7d81b6fc08237826
--- lams_central/web/login.jsp	(.../login.jsp)	(revision ec8852a3b210bda6bc32e99a177f4767dca7d8ee)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision eb0982fcbbcac3092ad52a1b7d81b6fc08237826)
@@ -118,11 +118,12 @@
 						</c:if>
 
 						<form action="/lams/j_security_check" method="POST" name="loginForm" role="form" class="form-horizontal" id="loginForm" autocomplete="off">
-						  <input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
-              <div class="input-group">
+							<input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" 
+						  		 escapeXml="true" />' />
+             				 <div class="input-group">
 								<span class="input-group-addon"><i class="fa fa-user"></i></span>
 								<input id="j_username" type="text" class="form-control" autocapitalize="off" name="j_username" value="" placeholder="<fmt:message key='label.username' />" onkeypress="onEnter(event)" tabindex="1">
-              </div>
+              				</div>
 
 							<div class="input-group voffset5">
 								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
@@ -145,16 +146,10 @@
 			</div>
 		</div>
 	</div>
-		<!--closes content-->
+	<!--closes content-->
 
-		<!-- starts footer -->
-		<div class="login-footer">
-			  <p class="text-muted text-center">
-					<fmt:message key="msg.LAMS.version" />:  <%=Configuration.get(ConfigurationKeys.VERSION)%>
-					<a href="/lams/www/copyright.jsp" target='copyright' onClick="openCopyRight()"> &copy; <fmt:message key="msg.LAMS.copyright.short" /></a>
-				</p>
-		</div>
-		<!--closes footer-->
+	<div class="login-footer"></div>
+
 		<!--closes page-->
 		</div> <!--  close login-content -->
 		</body>
@@ -179,24 +174,23 @@
 					</h4>
 				</div>
 
-
 				<form style="display: none" method="POST" action="j_security_check">
 					<input type="hidden" name="j_username" value="${login}" /> <input type="hidden" name="j_password"
 						value="${password}" /> <input type="hidden" name="redirectURL"
-						value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
+						value='<c:out value="${empty param.redirectURL ? redirectURL : param.redirectURL}" escapeXml="true" />' />
 				</form>
 				<div id="footer"></div>
 			</lams:Page>
 			<%
 				// invalidate session so a new user can be logged in
 				HttpSession hs = SessionManager.getSession();
 				if (hs != null) {
-				    hs.removeAttribute("login");
-				    hs.removeAttribute("password");
 					UserDTO userDTO = (UserDTO) hs.getAttribute("user");
 					if (userDTO != null) {
-					    SessionManager.removeSessionByLogin(userDTO.getLogin(), true);
+					    // remove session from mapping
+					    SessionManager.removeSessionByLogin(userDTO.getLogin(), false);
 					}
+					hs.invalidate();
 				}
 			%>
 			<script type="text/javascript">