Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.34 -r1.35
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	8 Feb 2007 00:34:36 -0000	1.34
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	14 Feb 2007 04:28:29 -0000	1.35
@@ -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);