Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	12 Jul 2004 14:49:34 -0000	1.28
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	13 Jan 2005 13:54:42 -0000	1.29
@@ -214,8 +214,8 @@
 
 ad_proc -private auth::local::password::ChangePassword {
     username
-    old_password
     new_password
+    {old_password ""}
     {parameters {}}
     {authority_id {}}
 } {
@@ -232,11 +232,14 @@
         set result(password_status) "no_account"
         return [array get result]
     }
-    
-    if { ![ad_check_password $user_id $old_password] } {
-        set result(password_status) "old_password_bad"
-        return [array get result]
+
+    if { ![empty_string_p $old_password] } {
+	if { ![ad_check_password $user_id $old_password] } {
+	    set result(password_status) "old_password_bad"
+	    return [array get result]
+	}
     }
+
     if { [catch { ad_change_password $user_id $new_password } errmsg] } {
         set result(password_status) "change_error"
         global errorInfo
@@ -313,7 +316,7 @@
     }
 
     # Reset the password
-    if [empty_string_p $new_password] {
+    if [exists_and_not_null new_password] {
 	set password $new_password
     } else {
 	set password [ad_generate_random_string]
@@ -323,7 +326,6 @@
 
     # We return the new passowrd here and let the OpenACS framework send the email with the new password
     set result(password) $password
-
     return [array get result]
 }