diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index a1c9767b..269853a7 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -3433,7 +3433,7 @@ var messages_right_memo = func {
 		fltCtlLandAsap = 0;
 	}
 	
-	if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1Fail.getValue() or warningNodes.Logic.eng2Fail.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) {
+	if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1FailFlipflop.getValue() or warningNodes.Logic.eng2FailFlipflop.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) {
 		# todo avionics smoke and reverse unlocked
 		land_asap_a.active = 1;
 	} else {
diff --git a/Nasal/ECAM/ECAM-nodes.nas b/Nasal/ECAM/ECAM-nodes.nas
index ac6dbf41..9a345383 100644
--- a/Nasal/ECAM/ECAM-nodes.nas
+++ b/Nasal/ECAM/ECAM-nodes.nas
@@ -140,6 +140,8 @@ var warningNodes = {
 		revSet: props.globals.initNode("/ECAM/warnings/logic/eng/reverse-set"),
 		eng1Fail: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-fail"),
 		eng2Fail: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-fail"),
+		eng1FailFlipflop: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-fail-output"),
+		eng2FailFlipflop: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-fail-output"),
 		phase5Trans: props.globals.initNode("/ECAM/warnings/logic/eng/phase-5-output"),
 		eng1Shutdown: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-shutdown"),
 		eng2Shutdown: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-shutdown"),
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index bf1b4e55..abc66dd1 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -6,6 +6,12 @@
 
 	<channel name="FWC" execrate="16">
 		
+		<actuator name="/ECAM/phases/timer/acconfig-running">
+			<input>/systems/acconfig/autoconfig-running</input>
+			<rate_limit sense="decr">0.2</rate_limit>
+			<rate_limit sense="incr">100</rate_limit>
+		</actuator>
+		
 		<actuator name="/ECAM/phases/timer/eng1idle-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/eng1idle</input>
@@ -2884,6 +2890,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-1-shutdown">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/dual-failure-enabled eq 0
 				<test logic="OR">
 					<test logic="AND">
@@ -2904,6 +2911,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-2-shutdown">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/dual-failure-enabled eq 0
 				<test logic="OR">
 					<test logic="AND">
@@ -2948,6 +2956,7 @@
 		<switch name="/ECAM/warnings/fctl/lrElevFault">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				<test logic="OR">
@@ -3056,6 +3065,7 @@
 		<switch name="/ECAM/warnings/fctl/altn-law">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				/it-fbw/law eq 1
@@ -3072,6 +3082,7 @@
 		<switch name="/ECAM/warnings/fctl/direct-law-output">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				/it-fbw/law eq 2