Index: openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl	2 Dec 2013 09:25:24 -0000	1.2
+++ openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl	28 Jun 2015 12:09:34 -0000	1.3
@@ -10,12 +10,12 @@
 
 } -validate {
     confirm_password -requires {password_2:notnull} {
-        if {[empty_string_p $password_2]} {
+        if {$password_2 eq ""} {
             ad_complain "[_ dotlrn.lt_You_need_to_confirm_t]"
         }
     }
     new_password_match -requires {password_1:notnull password_2:notnull confirm_password} {
-        if {![string equal $password_1 $password_2]} {
+        if {$password_1 ne $password_2 } {
             ad_complain "[_ dotlrn.lt_Your_passwords_dont_m]"
         }
     }
@@ -28,13 +28,13 @@
 set system_name [ad_system_name]
 
 set subject "[_ dotlrn.lt_Your_password_on_syst]"
-set change_password_url "[ad_url]/user/password-update?[export_vars {user_id {password_old $password_1}}]"
+set change_password_url [export_vars -base [ad_url]/user/password-update {user_id {password_old $password_1}}]
 set body "[_ dotlrn.lt_Please_follow_the_fol]"
 
 set email [acs_user::get_element -user_id $user_id -element email]
 
 # Send email
-if [catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg] {
+if {[catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg]} {
 	ns_log Error "[_ dotlrn.lt_Error_sending_email_t]" $errmsg
 	ad_return_error \
         "[_ dotlrn.Error_sending_mail]" \
@@ -46,7 +46,7 @@
     set admin_message "[_ dotlrn.lt_The_following_email_w_1]"
 
 
-    if [catch {acs_mail_lite::send -to_addr $system_owner -from_addr $system_owner -subject $admin_subject -body $admin_message} errmsg] {
+    if {[catch {acs_mail_lite::send -to_addr $system_owner -from_addr $system_owner -subject $admin_subject -body $admin_message} errmsg]} {
 	
 	ns_log Error "Error sending email from password-update-2.tcl" $errmsg
 	ad_return_error \
@@ -56,7 +56,7 @@
 }
 
 
-if {[empty_string_p $return_url]} {
+if {$return_url eq ""} {
     set return_url "user?user_id=$user_id"
 }