diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index b2c663b17..f455f887a 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -5348,7 +5348,7 @@ sub get_configuration( $$$$ ) {
     }
 
     if ( $val = $config{INVALID_DISPOSITION} ) {
-	if ( $val =~ /^(?:A_)?(?:DROP|ACCEPT)$/ ) {
+	if ( $val =~ /^(?:A_)?DROP$/ ) {
 	    $globals{INVALID_TARGET} = $val;
 	} elsif ( $val eq 'REJECT' ) {
 	    $globals{INVALID_TARGET} = 'reject';
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 5af80ba50..b12610d56 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -950,6 +950,8 @@ sub finish_chain_section ($$$) {
 			delete $state{ESTABLISHED};
 		    }
 		    
+		    $target = ensure_audit_chain( $target ) if ( $targets{$target} || 0 ) & AUDIT;
+
 		    add_ijump( $chainref, g => $target, state_imatch $_ );
 		}