diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index eb0764d4..25e3fafc 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -11,8 +11,6 @@
 	<!-- No button lights without power! -->
 	<animation>
 		<type>select</type>
-		<object-name>ACESSFeedBtn1F</object-name>
-		<object-name>ACESSFeedBtn2A</object-name>
 		<object-name>ACPack1Btn1F</object-name>
 		<object-name>ACPack1Btn2O</object-name>
 		<object-name>ACPack2Btn1F</object-name>
@@ -95,6 +93,8 @@
 
 	<animation>
 		<type>select</type>
+		<object-name>ACESSFeedBtn1F</object-name>
+		<object-name>ACESSFeedBtn2A</object-name>
 		<object-name>AftCargoIsoBtn1F</object-name>
 		<object-name>AftCargoIsoBtn2O</object-name>
 		<object-name>AftCargoSmkBtn1S</object-name>
@@ -3273,12 +3273,12 @@
 				<condition>
 					<or>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
-							<value>25</value>
+							<property>systems/electrical/bus/ac-1</property>
+							<value>110</value>
 						</greater-than-equals>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
+							<property>systems/electrical/bus/ac-2</property>
+							<value>110</value>
 						</greater-than-equals>
 					</or>
 				</condition>
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index dcb0067b..3cd7cffb 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -1070,10 +1070,24 @@
 		</switch>
 		
 		<!-- AC ESS Relays -->
+		<switch name="/systems/electrical/relay/ac-ess-feed-1/auto-switch">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/systems/electrical/bus/ac-1 lt 110
+			</test>
+		</switch>
+		
+		<actuator name="/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer">
+			<input>/systems/electrical/relay/ac-ess-feed-1/auto-switch</input>
+			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="incr">0.33333333333</rate_limit> <!-- 3 seconds -->
+		</actuator>
+		
 		<switch name="/systems/electrical/relay/ac-ess-feed-1/contact-pos"> <!-- TODO: via 1XC CB on 123VU -->
 			<default value="0"/>
 			<test logic="AND" value="1"> <!-- old AC ESS FEED supply mode -->
 				/controls/electrical/switches/ac-ess-feed eq 0
+				/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer lt 1
 				/controls/electrical/switches/emer-gen-test eq 0
 			</test>
 		</switch>
@@ -1088,7 +1102,10 @@
 		<switch name="/systems/electrical/relay/ac-ess-feed-2/contact-pos"> <!-- TODO: via 2XC CB on 123VU -->
 			<default value="0"/>
 			<test logic="AND" value="1"> <!-- old AC ESS FEED supply mode -->
-				/controls/electrical/switches/ac-ess-feed eq 1
+				<test logic="OR">
+					/controls/electrical/switches/ac-ess-feed eq 1
+					/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer eq 1
+				</test>
 				/controls/electrical/switches/emer-gen-test eq 0
 			</test>
 		</switch>
@@ -1862,7 +1879,6 @@
 		</switch>
 		
 		<actuator name="/systems/electrical/some-electric-thingie/static-inverter-timer">
-            <description>Timer for the ECAM system</description>
             <input>/systems/electrical/relay/ac-ess-feed-inverter/contact-pos</input>
             <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->