Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	21 Jan 2018 00:35:30 -0000	1.26
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	7 Apr 2018 19:30:45 -0000	1.27
@@ -63,7 +63,7 @@
         {message:text(hidden),optional}
     }
 
-if { ([info exists old_password] && $old_password ne "") } {
+if { $old_password ne "" } {
     set focus "update.password_1"
 } else {
     ad_form -extend -name update -form {
@@ -92,7 +92,7 @@
     }
 } -on_submit {
     
-    if { ([info exists old_password] && $old_password ne "") } {
+    if { $old_password ne "" } {
         set password_old $old_password
     }
     
@@ -106,11 +106,14 @@
             # Continue
         }
         old_password_bad {
-            if { (![info exists old_password] || $old_password eq "") } {
+            if { $old_password eq "" } {
                 form set_error update password_old $result(password_message)
             } else {
                 # This hack causes the form to reload as if submitted, but with the old password showing
-                ad_returnredirect [export_vars -base [ad_conn url] -entire_form -exclude { old_password } -override { { password_old $old_password } }]
+                ad_returnredirect [export_vars \
+                                       -base [ad_conn url] \
+                                       -entire_form -exclude { old_password } \
+                                       -override { { password_old $old_password } }]
                 ad_script_abort
             }
             break
@@ -122,7 +125,7 @@
     }
     
     # If old_password was supplied, handle authentication and log the user in
-    if { ([info exists old_password] && $old_password ne "") } {
+    if { $old_password ne "" } {
         
         # We use full-scale auth::authenticate here, in order to be sure we also get account-status checked
         # Hm. What if there's a problem with timing, so the password update doesn't take effect immediately?
@@ -144,7 +147,7 @@
             }
         }
         
-        if { ([info exists auth_info(account_url)] && $auth_info(account_url) ne "") } {
+        if { [info exists auth_info(account_url)] && $auth_info(account_url) ne "" } {
             ad_returnredirect $auth_info(account_url)
             ad_script_abort
         }