diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index aec373f3..59a21701 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -3248,16 +3248,10 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<or>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
-							<value>25</value>
-						</greater-than-equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
-					</or>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-bat</property>
+						<value>25</value>
+					</greater-than-equals> <!-- control is on DC BAT bus - so if you enter EMER ELEC with it turned off, too bad -->
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/electrical/switches/apu</property>
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index 421837bd..a5f0e0e3 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -1384,12 +1384,14 @@
 			</test>
 		</switch>
 			
-		<switch name="/systems/electrical/light/apu-fault"> <!-- TODO: check out connection to engines -->
+		<switch name="/systems/electrical/light/apu-fault">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/electrical/switches/apu eq 1
 				/systems/electrical/relay/apu-glc/contact-pos eq 0
 				/systems/electrical/relay/ext-epc/contact-pos eq 0
+				/systems/electrical/relay/gen-1-glc/contact-pos eq 0
+				/systems/electrical/relay/gen-2-glc/contact-pos eq 0
 				/systems/electrical/sources/apu/drive-rpm gt 2000
 			</test>
 		</switch>