Index: lams_central/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v
diff -u -r1.51.2.16 -r1.51.2.17
--- lams_central/web/login.jsp	7 Mar 2016 21:45:35 -0000	1.51.2.16
+++ lams_central/web/login.jsp	16 Mar 2016 12:13:47 -0000	1.51.2.17
@@ -8,24 +8,13 @@
 <%@ page import="org.lamsfoundation.lams.web.session.SessionManager"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.dto.UserDTO"%>
 
-<%-- Attributes in request come from sysadmin LoginAs action
-	 while in session from LoginRequestServlet
-	 
-	 <c:set var="login" value="${empty requestScope.login ? sessionScope.login : requestScope.login}" scope="page" />
-<c:set var="password" value="${empty requestScope.password ? sessionScope.password : requestScope.password}" scope="page" />
-	 
---%>
 <c:if test="${empty requestScope.login}">
 	<c:set var="login" value="${sessionScope.login}" />
 	<c:set var="password" value="${sessionScope.password}" />
 </c:if>
 
 <!DOCTYPE html>
 <lams:html>
-<!--
-flash is searching for this string, so leave it!:
-j_security_login_page
--->
 
 <%-- If login param is empty, this is a regular, manual login page.
 	 Otherwise it is a just an almost empty redirect page for integrations and LoginAs authentication.
