Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b -r7b89a024a3408d102799244f2f6fbceb03f34ed1
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7b89a024a3408d102799244f2f6fbceb03f34ed1)
@@ -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
===================================================================
diff -u -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b -r7b89a024a3408d102799244f2f6fbceb03f34ed1
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7b89a024a3408d102799244f2f6fbceb03f34ed1)
@@ -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
===================================================================
diff -u -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405 -r7b89a024a3408d102799244f2f6fbceb03f34ed1
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 7b89a024a3408d102799244f2f6fbceb03f34ed1)
@@ -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));