Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -ree5e930b9434a53ef840c4dc983be4eeea45336d -r6e0e90dc7e6da0768ae9b479e544172b7f87472a
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision ee5e930b9434a53ef840c4dc983be4eeea45336d)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 6e0e90dc7e6da0768ae9b479e544172b7f87472a)
@@ -99,8 +99,10 @@
 		
 		// check if user is flagged as needing to change their password
 		User loggedInUser = getService().getUserByLogin(request.getRemoteUser());
-		if (loggedInUser.getChangePassword()) {
-			return mapping.findForward("password");
+		if (loggedInUser.getChangePassword()!=null) {
+			if (loggedInUser.getChangePassword()) {
+				return mapping.findForward("password");
+			}
 		}
 		
 		String tab = WebUtil.readStrParam(request, "tab", true);