Index: openacs-4/packages/acs-authentication/tcl/password-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/password-procs.tcl,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/acs-authentication/tcl/password-procs.tcl	10 Sep 2015 08:21:13 -0000	1.19.2.2
+++ openacs-4/packages/acs-authentication/tcl/password-procs.tcl	20 Oct 2015 08:19:13 -0000	1.19.2.3
@@ -449,11 +449,12 @@
     # Check the result code and provide canned responses
     switch $result(password_status) {
         ok {
-            if { ([info exists result(password)] && $result(password) ne "") && \
-                     (!$admin_p || [parameter::get \
-                                        -parameter EmailChangedPasswordP \
-                                        -package_id [ad_conn subsite_id] \
-                                        -default 1]) } {
+            if { [info exists result(password)] && $result(password) ne ""
+                 && (!$admin_p || [parameter::get \
+                                       -parameter EmailChangedPasswordP \
+                                       -package_id [ad_conn subsite_id] \
+                                       -default 1])
+             } {
                 # We have retrieved or reset a forgotten password that we should email to the user
                 with_catch errmsg {
                     auth::password::email_password \