Index: openacs-4/packages/acs-subsite/www/register/recover-password.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.tcl,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/acs-subsite/www/register/recover-password.tcl	10 Apr 2019 21:05:36 -0000	1.16.2.1
+++ openacs-4/packages/acs-subsite/www/register/recover-password.tcl	10 Apr 2019 21:09:58 -0000	1.16.2.2
@@ -32,7 +32,6 @@
     ad_script_abort
 }
 
-
 ad_form -name recover \
     -edit_buttons [list [list [_ acs-kernel.common_continue] ok]] \
     -form { {dummy:text(hidden),optional} }
@@ -79,9 +78,14 @@
 
 ad_form -extend -name recover -on_request {}
 
-# We handle form submission here, because otherwise we can't handle both the case where we use the form
-# and the case where we don't in one go
-if { [form is_valid recover] || (![form is_submission recover] && (([info exists username] && $username ne "") || ([info exists email] && $email ne ""))) } {
+#
+# We handle form submission here, because otherwise we can't handle
+# both the case where we use the form and the case where we don't in
+# one go.
+#
+if { [form is_valid recover]
+     || (![form is_submission recover] && ($username ne "" || $email ne ""))
+ } {
     array set recover_info [auth::password::recover_password \
                                 -authority_id $authority_id \
                                 -username $username \