Index: lams_central/web/login.jsp
===================================================================
diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r20ce199831888b996374f8873220db09b375a74c
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 64938df458cbab9999f9a826ef2902d061648d7d)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 20ce199831888b996374f8873220db09b375a74c)
@@ -32,6 +32,7 @@
 flash is searching for this string, so leave it!:
 j_security_login_page
 -->
+<c:set var="encrypt"><%= Configuration.getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER) %></c:set>
 <lams:head>
 	<title><fmt:message key="title.login.window"/></title>
 	<lams:css  style="core"/>
@@ -46,8 +47,10 @@
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/sha1.js"></script>
 	<script>
 		function submitForm(){
-			  var password=document.loginForm.j_password.value;	 
+			  var password=document.loginForm.j_password.value;
+			  <c:if test="${encrypt eq 'true'}">
 			  document.loginForm.j_password.value=hex_sha1(password);
+			  </c:if>
 			  document.loginForm.submit();
 		}