Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.89.2.7 -r1.89.2.8
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	31 Jan 2017 17:51:03 -0000	1.89.2.7
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	7 Mar 2017 19:53:19 -0000	1.89.2.8
@@ -618,16 +618,16 @@
         set creation_info(account_status) closed
     }
 
-    if { ([info exists local_account_message] && $local_account_message ne "") } {
-        if { ([info exists creation_info(account_message)] && $creation_info(account_message) ne "") } {
+    if { [info exists local_account_message] && $local_account_message ne "" } {
+        if { [info exists creation_info(account_message)] && $creation_info(account_message) ne "" } {
             # Concatenate local and remote account messages
             set creation_info(account_message) "<p>[auth::authority::get_element -authority_id $authority_id -element pretty_name]: $creation_info(account_message)</p> <p>[ad_system_name]: $local_account_message</p>"
         } else {
             set creation_info(account_message) $local_account_message
         }
     }
         
-    # Issue login cookie if login was successful
+    # Unless nologin was specified, issue login cookie if login was successful
     if { !$nologin_p && $creation_info(creation_status) eq "ok" && $creation_info(account_status) eq "ok" && [ad_conn user_id] == 0 } {
         auth::issue_login -user_id $creation_info(user_id)
     }
@@ -1566,7 +1566,7 @@
                                -username $username]
         
         if { $user(user_id) eq "" } {
-    set this_authority [auth::authority::get_element -authority_id $authority_id -element pretty_name]
+            set this_authority [auth::authority::get_element -authority_id $authority_id -element pretty_name]
             set element_messages(username) [_ acs-subsite.Username_not_found_for_authority]
         }
     } else {
@@ -1614,7 +1614,7 @@
         }
     }
     
-    if { ([info exists user(email)] && $user(email) ne "") } {
+    if { [info exists user(email)] && $user(email) ne "" } {
         # Check that email is unique
         set email $user(email)
         set email_party_id [party::get_by_email -email $user(email)]