Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-subsite/lib/login.tcl	1 Oct 2017 12:16:05 -0000	1.38
+++ openacs-4/packages/acs-subsite/lib/login.tcl	5 Jan 2018 22:29:13 -0000	1.39
@@ -297,10 +297,10 @@
                 set message [expr { [info exists auth_info(account_message)] ? $auth_info(account_message) : "" }]
 		# Display the message on a separate page
                 ad_returnredirect \
-                -message $message \
-                -html \
-                [export_vars \
-                     -base "[subsite::get_element -element url]register/account-closed"]
+                    -message $message \
+                    -html \
+                    [export_vars \
+                         -base "[subsite::get_element -element url]register/account-closed"]
 		ad_script_abort
 	    }
         }
Index: openacs-4/packages/acs-subsite/www/group-leave.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-leave.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/group-leave.tcl	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/group-leave.tcl	5 Jan 2018 22:29:13 -0000	1.5
@@ -35,6 +35,7 @@
 }
 
 ad_returnredirect -message "You have left the group \"$group_info(group_name)\"." $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	7 Aug 2017 23:47:59 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	5 Jan 2018 22:29:13 -0000	1.19
@@ -166,7 +166,7 @@
                 # Delete the item
                 content::item::delete -item_id $resized_portrait($name)
 
-                # Resize the item
+                 # Resize the item
                 image::resize -item_id $item_id -size_name $name
             }
         }
@@ -182,10 +182,12 @@
     util_memoize_flush [list acs_user::get_portrait_id_not_cached -user_id $user_id]
 
     ad_returnredirect $return_url
+    ad_script_abort
+
+} else {
+    ad_return_template
 }
 
-ad_return_template
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4