diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index 0dca4f6bc6..df30e84aca 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -64,8 +64,10 @@
 #define STM32_HSECLK 16000000
 
 #define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 4
 #define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
 
 #define LED_NUM_LOCK_PIN C12
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c
index c4229ef997..cb5ec3dc12 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.c
@@ -18,10 +18,6 @@
 
 void keyboard_post_init_kb(void)
 {
-    // Solenoid enable:
-    setPinOutput(C13);
-    writePin(C13, 1);
-
     //debug_enable=true;
     //debug_matrix=true;
 }
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
index fb9a872299..feb2e32d57 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
@@ -63,8 +63,10 @@
 #define STM32_HSECLK 16000000
 
 #define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 4
 #define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
 
 #define LED_NUM_LOCK_PIN C12
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c
index c4229ef997..cb5ec3dc12 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/overnumpad_1xb.c
@@ -18,10 +18,6 @@
 
 void keyboard_post_init_kb(void)
 {
-    // Solenoid enable:
-    setPinOutput(C13);
-    writePin(C13, 1);
-
     //debug_enable=true;
     //debug_matrix=true;
 }
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
index fb9a872299..feb2e32d57 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
@@ -63,8 +63,10 @@
 #define STM32_HSECLK 16000000
 
 #define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 4
 #define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
 
 #define LED_NUM_LOCK_PIN C12
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c
index c4229ef997..cb5ec3dc12 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/overnumpad_1xb.c
@@ -18,10 +18,6 @@
 
 void keyboard_post_init_kb(void)
 {
-    // Solenoid enable:
-    setPinOutput(C13);
-    writePin(C13, 1);
-
     //debug_enable=true;
     //debug_matrix=true;
 }
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
index bfb1a9cf68..597d287b07 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
@@ -63,8 +63,10 @@
 #define STM32_HSECLK 16000000
 
 #define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 4
 #define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
 
 #define LED_CAPS_LOCK_PIN C12
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c
index 41f51b7575..eda367804d 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/overnumpad_1xb.c
@@ -23,9 +23,6 @@ void keyboard_post_init_kb(void)
     setPinOutput(C11); // middle led, always off on Spacesaver M
     writePin(C11, 0);
     setPinOutput(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer
-    // Solenoid enable:
-    setPinOutput(C13);
-    writePin(C13, 1);
 
     //debug_enable=true;
     //debug_matrix=true;
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index f3ce89431e..7bd5b224df 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -64,8 +64,10 @@
 #define STM32_HSECLK 16000000
 
 #define SOLENOID_PIN B5
+#define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 4
 #define SOLENOID_MIN_DWELL 4
+#define HAPTIC_OFF_IN_LOW_POWER 1
 #define NO_HAPTIC_MOD
 
 #define LED_CAPS_LOCK_PIN C12
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c
index 5d91eae20e..b7e3fd9632 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/overnumpad_1xb.c
@@ -23,9 +23,6 @@ void keyboard_post_init_kb(void)
     setPinOutput(C11); // middle led, always off on Spacesaver M
     writePin(C11, 0);
     setPinOutput(C10); // right-most led, normally Scroll Lock, but on Spacesaver M indicates function layer
-    // Solenoid enable:
-    setPinOutput(C13);
-    writePin(C13, 1);
 
     //debug_enable=true;
     //debug_matrix=true;