Index: lams_central/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v
diff -u -r1.26.2.4 -r1.26.2.5
--- lams_central/web/login.jsp	19 Apr 2007 06:51:38 -0000	1.26.2.4
+++ lams_central/web/login.jsp	20 Apr 2007 06:04:20 -0000	1.26.2.5
@@ -13,7 +13,7 @@
 
 	String shibUsername = (String) request.getHeader("LAMS-Login");
 	String shibLoginExists = (String) session.getAttribute("shibLoginExists");
-	if (shibUsername != null && shibLoginExists != "true") {
+	if (shibUsername != null && shibUsername.trim().length()>0 && shibLoginExists != "true") {
 		response.sendRedirect("ShibLogin");
 	}
 
@@ -129,7 +129,7 @@
 					</c:if>
 					<% if (shibLoginExists == "true") { %>
 						<div class="warning-login">
-							Shibboleth username '<%= shibUsername %>' is taken.
+							<fmt:message key="shibboleth.username.taken"/>: <%= shibUsername %>
 						</div>
 					<% } %>
 				 <p class="first"><fmt:message key="label.username"/>: