Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.84 -r1.85
--- lams_central/conf/language/lams/ApplicationResources.properties	28 Aug 2009 07:20:55 -0000	1.84
+++ lams_central/conf/language/lams/ApplicationResources.properties	30 Oct 2009 00:40:39 -0000	1.85
@@ -273,6 +273,7 @@
 label.lamscommunity.info  =The LAMS Community is a global online community for all teachers, administrators and developers that use LAMS. Within the various sub-communities, you can access the latest news about LAMS, many different discussion forums, and a repository of shared LAMS sequences.
 label.html.htmlTheme  =HTML Theme
 label.html.flashTheme  =Flash Theme
+error.password.empty = New password cannot be empty.
 
 
 #======= End labels: Exported 268 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.77 -r1.78
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	28 Aug 2009 07:20:56 -0000	1.77
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	30 Oct 2009 00:40:39 -0000	1.78
@@ -273,6 +273,7 @@
 label.lamscommunity.info  =The LAMS Community is a global online community for all teachers, administrators and developers that use LAMS. Within the various sub-communities, you can access the latest news about LAMS, many different discussion forums, and a repository of shared LAMS sequences.
 label.html.htmlTheme  =HTML Theme
 label.html.flashTheme  =Flash Theme
+error.password.empty = New password cannot be empty.
 
 
 #======= End labels: Exported 268 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v
diff -u -r1.12 -r1.13
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	20 Aug 2007 06:15:47 -0000	1.12
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	30 Oct 2009 00:40:39 -0000	1.13
@@ -110,11 +110,16 @@
 						errors.add("oldPassword", new ActionMessage("error.oldpassword.mismatch"));
 						log.debug("old pass wrong");
 					}
-					if(password == null || password.length() == 0 || !password.equals(passwordConfirm)) 
+					if(!password.equals(passwordConfirm)) 
 					{
 						errors.add("password", new ActionMessage("error.newpassword.mismatch"));
 						log.debug("new pass wrong");
 					}
+					if(password == null || password.length() == 0)
+					{
+					    	errors.add("password", new ActionMessage("error.password.empty"));
+					    	log.debug("new password cannot be empty");
+					}
 					if (errors.isEmpty())
 					{
 			        	//service.updatePassword(login, HashUtil.sha1(password));