Index: /WAeUP_SRP/trunk/skins/waeup_student/change_password.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 5044)
+++ /WAeUP_SRP/trunk/skins/waeup_student/change_password.py	(revision 5045)
@@ -61,5 +61,5 @@
 old_password = request.get('widget__old_password')
 if not wt.checkPassword(student_id,old_password):
-    psm = "Old Password is not correct"
+    psm = "Old password is not correct!"
     return context.change_password_form(rendered = res,
                              psm = psm,
@@ -71,4 +71,14 @@
 #set_trace()
 password = request.get('widget__password')
+if not len(password):
+    psm = "Please enter a new password!"
+    return context.change_password_form(rendered = res,
+                             psm = psm,
+                             ds = ds,
+                             mode = "edit",
+                             formaction = "change_password",
+                             button = "Change Password",
+                             )
+
 wt.editPassword(student_id,password)
 logger.info('%s changed password from %s to %s' % (member_id,old_password,password))
