Index: openacs-4/packages/acs-admin/lib/become.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/become.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/lib/become.tcl	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/lib/become.tcl	5 Jan 2018 22:59:57 -0000	1.5
@@ -29,8 +29,8 @@
 
 ad_user_login $user_id
 ad_returnredirect $return_url
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-admin/lib/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/password-update.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/lib/password-update.tcl	1 Oct 2017 12:16:05 -0000	1.6
+++ openacs-4/packages/acs-admin/lib/password-update.tcl	5 Jan 2018 22:59:57 -0000	1.7
@@ -99,6 +99,7 @@
     # ad_return_template /packages/acs-subsite/www/register/display-message
 
     ad_returnredirect $return_url
+    ad_script_abort
 }
 
 # Local variables:
Index: openacs-4/packages/acs-api-browser/www/set-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/set-default.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/set-default.tcl	7 Aug 2017 23:47:46 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/set-default.tcl	5 Jan 2018 22:59:57 -0000	1.4
@@ -8,6 +8,7 @@
 ad_set_client_property -persistent t acs-api-browser api_doc_source_p $source_p
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-automated-testing/www/rebuild-server.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/Attic/rebuild-server.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/www/rebuild-server.tcl	7 Aug 2017 23:47:46 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/www/rebuild-server.tcl	5 Jan 2018 22:59:57 -0000	1.3
@@ -7,9 +7,9 @@
 exec sudo /usr/local/bin/rebuild-server.sh $server >& /web/master/www/rebuild-$server.log &
 
 ad_returnredirect /rebuild-$server.log
+ad_script_abort
 
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-developer-support/www/css-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-developer-support/www/css-edit.tcl	7 Aug 2017 23:47:56 -0000	1.5
+++ openacs-4/packages/acs-developer-support/www/css-edit.tcl	5 Jan 2018 22:59:57 -0000	1.6
@@ -101,9 +101,13 @@
 
     } -after_submit {
 	ad_returnredirect $return_url
+        ad_script_abort
+
     } -cancel_url $return_url
+
 } else {
     ad_returnredirect $return_url
+    ad_script_abort
 }
 
 # Local variables:
Index: openacs-4/packages/acs-developer-support/www/css-make-live.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-make-live.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-developer-support/www/css-make-live.tcl	7 Aug 2017 23:47:56 -0000	1.4
+++ openacs-4/packages/acs-developer-support/www/css-make-live.tcl	5 Jan 2018 22:59:57 -0000	1.5
@@ -29,6 +29,7 @@
 file copy -force -- $source $target
 
 ad_returnredirect $return_url_2
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-developer-support/www/set-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set-user.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-developer-support/www/set-user.tcl	7 Aug 2017 23:47:56 -0000	1.3
+++ openacs-4/packages/acs-developer-support/www/set-user.tcl	5 Jan 2018 22:59:57 -0000	1.4
@@ -11,6 +11,7 @@
 ad_set_client_property developer-support user_id $user_id
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-developer-support/www/set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-developer-support/www/set.tcl	7 Aug 2017 23:47:56 -0000	1.4
+++ openacs-4/packages/acs-developer-support/www/set.tcl	5 Jan 2018 22:59:57 -0000	1.5
@@ -41,6 +41,7 @@
     }
 }
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-lang/www/change-locale.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/change-locale.tcl	7 Aug 2017 23:47:57 -0000	1.4
+++ openacs-4/packages/acs-lang/www/change-locale.tcl	5 Jan 2018 22:59:57 -0000	1.5
@@ -11,6 +11,7 @@
 } else {
     ad_returnredirect $return_url
 }
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-object-management/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-object-management/www/index.tcl	27 Nov 2009 00:38:50 -0000	1.1
+++ openacs-4/packages/acs-object-management/www/index.tcl	5 Jan 2018 22:59:57 -0000	1.2
@@ -1 +1,2 @@
 ad_returnredirect admin
+ad_script_abort
Index: openacs-4/packages/acs-service-contract/www/binding-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-install.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/www/binding-install.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-service-contract/www/binding-install.tcl	5 Jan 2018 22:59:57 -0000	1.4
@@ -11,6 +11,7 @@
 db_exec_plsql binding_install "select acs_sc_binding__new($contract_id,$impl_id)"
 
 ad_returnredirect ""
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl	5 Jan 2018 22:59:57 -0000	1.4
@@ -11,6 +11,7 @@
 db_exec_plsql binding_uninstall "select acs_sc_binding__delete($contract_id,$impl_id)"
 
 ad_returnredirect ""
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-tcl/lib/page-error.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/lib/page-error.tcl	7 Aug 2017 23:47:59 -0000	1.11
+++ openacs-4/packages/acs-tcl/lib/page-error.tcl	5 Jan 2018 22:59:57 -0000	1.12
@@ -290,14 +290,15 @@
             -array row \
             -entry_id [element get_value bug_edit entry_id]
     
-     ad_returnredirect $return_url
+    ad_returnredirect $return_url
     ad_script_abort
-   } -edit_request {
+  
+  } -edit_request {
       # ID form complains if -edit_request is missing
-}
+  }
 
 
-if { ![form is_valid bug_edit] } {
+  if { ![form is_valid bug_edit] } {
     
     # Get the bug data
     bug_tracker::bug::get -bug_id $bug_id -array bug -enabled_action_id $enabled_action_id
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.68 -r1.69
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	24 Dec 2017 12:56:09 -0000	1.68
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	5 Jan 2018 22:59:57 -0000	1.69
@@ -3295,6 +3295,7 @@
             set pattern [ns_urlencode "clear_one"]=[ns_urlencode "$clear_one"]
             regsub "${pattern}&?" [ad_return_url] {} url
             ad_returnredirect $url
+            ad_script_abort
         }
     } -on_submit {