Index: unix_installer/installer-package/conf/unix/jboss/login-config.xml
===================================================================
diff -u -r0965ee8a6bd49be2d53cad08225f707b32a61674 -rb7b01efd191eaacd6f9220e339bb93b3c96a8215
--- unix_installer/installer-package/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision 0965ee8a6bd49be2d53cad08225f707b32a61674)
+++ unix_installer/installer-package/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision b7b01efd191eaacd6f9220e339bb93b3c96a8215)
@@ -150,13 +150,13 @@
        </authentication>
     </application-policy>
 
-	<application-policy name = "lams-DB">
+	<application-policy name = "lams">
        <authentication>
-          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
-             <module-option name="dsJndiName">java:/MySqlDS</module-option>
+          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
+             <module-option name="dsJndiName">java:/jdbc/lams-ds</module-option>
              <module-option name="principalsQuery">select password from lams_user where login=?</module-option>
              <module-option name="rolesQuery">
-	            SELECT DISTINCT  r.name,'Roles' FROM
+             	SELECT DISTINCT  r.name,'Roles' FROM
              	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
              	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
              	LEFT OUTER JOIN lams_role r USING (role_id)
@@ -166,14 +166,6 @@
        </authentication>
     </application-policy>
 
-	<application-policy name = "lams">
-       <authentication>
-          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
-             <module-option name="authenticationPropertyFile">@confdir@/lamsauthentication.xml</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
 
-
 </policy>