diff --git a/Marlin/pins_FELIX2.h b/Marlin/pins_FELIX2.h
index 83ce47bf5b..31906b5151 100644
--- a/Marlin/pins_FELIX2.h
+++ b/Marlin/pins_FELIX2.h
@@ -30,6 +30,7 @@
 
 #define BOARD_NAME "Felix 2.0+"
 
+// Power outputs EFBF or EFBE
 #define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_13.h
index 36fc0f7b8e..3b5b242ab5 100644
--- a/Marlin/pins_MKS_13.h
+++ b/Marlin/pins_MKS_13.h
@@ -35,6 +35,7 @@
 
 #define BOARD_NAME "MKS > v1.3"
 
+// Power outputs EFBF or EFBE
 #define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/pins_MKS_BASE.h
index fdaff06891..8c7222017a 100644
--- a/Marlin/pins_MKS_BASE.h
+++ b/Marlin/pins_MKS_BASE.h
@@ -30,6 +30,7 @@
 
 #define BOARD_NAME "MKS BASE 1.0"
 
+// Power outputs EFBF or EFBE
 #define MOSFET_D_PIN 7
 
 #include "pins_RAMPS.h"
\ No newline at end of file
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 88a457b2a9..3280dd3e0b 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -115,7 +115,7 @@
 #endif
 
 // Augmentation for auto-assigning RAMPS plugs
-#if DISABLED(IS_RAMPS_EEB) && DISABLED(IS_RAMPS_EEF) && DISABLED(IS_RAMPS_EFB) && DISABLED(IS_RAMPS_EFF) && DISABLED(IS_RAMPS_SF)
+#if DISABLED(IS_RAMPS_EEB) && DISABLED(IS_RAMPS_EEF) && DISABLED(IS_RAMPS_EFB) && DISABLED(IS_RAMPS_EFF) && DISABLED(IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
   #if HOTENDS > 1
     #if TEMP_SENSOR_BED
       #define IS_RAMPS_EEB
@@ -163,7 +163,7 @@
   #define CONTROLLERFAN_PIN  -1
 #elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
   #define FAN_PIN        RAMPS_D8_PIN
-#else                                          // Non-specific are "EFB" by legacy
+#else                                          // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
   #define FAN_PIN        RAMPS_D9_PIN
   #define HEATER_BED_PIN RAMPS_D8_PIN
   #if HOTENDS == 1