diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index bb93b9fb8..c02497d2e 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -265,9 +265,9 @@ sub generate_script_2() {
 	push_indent;
 
 	if ( $global_variables & NOT_RESTORE ) {
-	    emit( 'start|restart|refresh|enable)' );
+	    emit( 'start|restart|refresh|disable|enable)' );
 	} else {
-	    emit( 'start|restart|refresh|enable|restore)' );
+	    emit( 'start|restart|refresh|disable|enable|restore)' );
 	}
 
 	push_indent;
diff --git a/Shorewall/Perl/prog.footer b/Shorewall/Perl/prog.footer
index 8e450509e..e2e56f3b2 100644
--- a/Shorewall/Perl/prog.footer
+++ b/Shorewall/Perl/prog.footer
@@ -310,11 +310,11 @@ case "$COMMAND" in
 	status=0;
 	;;
     enable)
-	detect_configuration
 	[ $# -eq 1 ] && exit 0
 	shift
 	[ $# -ne 1 ] && usage 2
 	if shorewall_is_started; then
+	    detect_configuration
 	    enable_provider $1
 	fi
 	status=0
@@ -324,6 +324,7 @@ case "$COMMAND" in
 	shift
 	[ $# -ne 1 ] && usage 2
 	if shorewall_is_started; then
+	    detect_configuration
 	    disable_provider $1
 	fi
 	status=0