diff --git a/spam/edit_db.cgi b/spam/edit_db.cgi
index 3df68a358..9eef2882e 100755
--- a/spam/edit_db.cgi
+++ b/spam/edit_db.cgi
@@ -2,8 +2,10 @@
 # Show form for SpamAssassin DB options
 
 require './spam-lib.pl';
+&ReadParse();
+&set_config_file_in(\%in);
 &can_use_check("db");
-&ui_print_header(undef, $text{'db_title'}, "");
+&ui_print_header($header_subtext, $text{'db_title'}, "");
 $conf = &get_config();
 
 print "$text{'db_desc'}<p>\n";
@@ -100,8 +102,6 @@ $pass = &find("user_scores_ldap_password", $conf);
 &opt_field("user_scores_ldap_password", $pass, 20, undef);
 print "</td> </tr>\n";
 
-
-
 &end_form(undef, $text{'save'});
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($redirect_url, $text{'index_return'});
 
diff --git a/spam/edit_procmail.cgi b/spam/edit_procmail.cgi
index 470b9483d..4a067b4be 100755
--- a/spam/edit_procmail.cgi
+++ b/spam/edit_procmail.cgi
@@ -2,6 +2,8 @@
 # Allow changing of the rule for delivering spam
 
 require './spam-lib.pl';
+&ReadParse();
+&set_config_file_in(\%in);
 &can_use_check("procmail");
 &ui_print_header(undef, $text{'procmail_title'}, "");
 
@@ -41,6 +43,7 @@ else {
 	}
 
 print "<form action=save_procmail.cgi>\n";
+print $form_hiddens;
 print "<table>\n";
 
 # Spam destination inputs
@@ -84,5 +87,5 @@ print "$text{'setup_head'}<p>\n";
 
 print "<input type=submit value='$text{'procmail_ok'}'></form>\n";
 
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($redirect_url, $text{'index_return'});
 
diff --git a/spam/save_db.cgi b/spam/save_db.cgi
index e132db862..70c5f9864 100755
--- a/spam/save_db.cgi
+++ b/spam/save_db.cgi
@@ -3,8 +3,9 @@
 
 require './spam-lib.pl';
 &error_setup($text{'db_err'});
-&can_use_check("db");
 &ReadParse();
+&set_config_file_in(\%in);
+&can_use_check("db");
 &execute_before("db");
 &lock_spam_files();
 $conf = &get_config();
@@ -53,7 +54,7 @@ else {
 &unlock_spam_files();
 &execute_after("db");
 &webmin_log("db");
-&redirect("");
+&redirect($redirect_url);
 
 sub username_check
 {
diff --git a/spam/save_procmail.cgi b/spam/save_procmail.cgi
index a9d382661..67fd2ad0f 100755
--- a/spam/save_procmail.cgi
+++ b/spam/save_procmail.cgi
@@ -3,8 +3,9 @@
 
 require './spam-lib.pl';
 &error_setup($text{'procmail_err'});
-&can_use_check("procmail");
 &ReadParse();
+&set_config_file_in(\%in);
+&can_use_check("procmail");
 
 # Validate inputs
 $type = undef;
@@ -70,5 +71,5 @@ if ($module_info{'usermin'} && $file ne "/dev/null") {
 
 # All done!
 &webmin_log("procmail");
-&redirect("");
+&redirect($redirect_url);