diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5b53122658..e38d04e32d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1066,7 +1066,7 @@
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
 #define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
 
-#if NONE(ABL_EZABL, ABL_BLTOUCH, MachineCR2020)
+#if NONE(ABL_EZABL, ABL_BLTOUCH)
   #define Z_MIN_ENDSTOP_INVERTING false  // set to true to invert the logic of the endstop.
   #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
 #else
@@ -2597,9 +2597,9 @@
 //=============================================================================
 #if(ENABLED(MachineEnder4) && DISABLED(GraphicLCD))
   #define REPRAP_DISCOUNT_SMART_CONTROLLER
-#elif ANY(MachineEnder2, MachineCR2020)
+#elif ENABLED(MachineEnder2)
   #define MINIPANEL
-#elif ENABLED(MachineCR20)
+#elif ANY(MachineCR20, MachineCR2020)
   #define MKS_MINI_12864
 #elif NONE(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, OrigLCD) || ENABLED(GraphicLCD)
   #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9ff7058a66..3372ecf2f7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -408,7 +408,7 @@
   #define INVERT_CASE_LIGHT false             // Set true if Case Light is ON when pin is LOW
   #define CASE_LIGHT_DEFAULT_ON true          // Set default power-up state on
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 255   // Set default power-up brightness (0-255, requires PWM pin)
-  #define MENU_ITEM_CASE_LIGHT              // Add a Case Light option to the LCD main menu
+  #define CASE_LIGHT_MENU              // Add a Case Light option to the LCD main menu
   //#define CASE_LIGHT_USE_NEOPIXEL           // Use Neopixel LED as case light, requires NEOPIXEL_LED.
   #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
     #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 62f584d502..b9f60d3dfc 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -40,12 +40,15 @@
 #endif
 
 #define SD_DETECT_PIN 49  // Always define onboard SD detect
-#define BEEPER_PIN    37  // Always define beeper pin so Play Tone works with ExtUI
 
-#define PS_ON_PIN        40 // Used by CR2020 Industrial series
+#define PS_ON_PIN     12 // Used by CR2020 Industrial series
 
 #include "pins_RAMPS.h"
 
+#ifndef BEEPER_PIN
+  #define BEEPER_PIN    37  // Always define beeper pin so Play Tone works with ExtUI
+#endif
+
 #define EXP1_PIN 65   // A11 // Case light for CR2020 Industrial series
 #define EXP2_PIN 66   // A12
 #define EXP3_PIN 11   // SERVO0_PIN