diff --git a/keyboards/handwired/jotanck/keymaps/vial/keymap.c b/keyboards/handwired/jotanck/keymaps/vial/keymap.c
index e6f8f854a2..86cc1547ed 100644
--- a/keyboards/handwired/jotanck/keymaps/vial/keymap.c
+++ b/keyboards/handwired/jotanck/keymaps/vial/keymap.c
@@ -77,7 +77,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-  writePin(JOTANCK_LED1, (get_highest_layer(state) == 4));
-  writePin(JOTANCK_LED2, (get_highest_layer(state) == 5));
+  #ifdef JOTANCK_LEDS
+  writePin(JOTANCK_LED2, (IS_LAYER_ON_STATE(state, 3)));
+  #endif
   return state;
 }
+
+bool led_update_user(led_t led_state) {
+  // NumLock allways on
+  if (!led_state.num_lock) {
+    tap_code(KC_NUM_LOCK);
+  }
+  #ifdef JOTANCK_LEDS
+  writePin(JOTANCK_LED1, led_state.caps_lock);
+  #endif
+  return true;
+}
diff --git a/keyboards/handwired/jotanck/keymaps/vial/rules.mk b/keyboards/handwired/jotanck/keymaps/vial/rules.mk
index e00dd2bf78..ce1c9b632e 100644
--- a/keyboards/handwired/jotanck/keymaps/vial/rules.mk
+++ b/keyboards/handwired/jotanck/keymaps/vial/rules.mk
@@ -1,9 +1,9 @@
 BOOTMAGIC_ENABLE = yes
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
-MOUSEKEY_ENABLE = yes
+MOUSEKEY_ENABLE = no
 COMBO_ENABLE = yes
 TAPDANCE_ENABLE = yes
 LTO_ENABLE = no
-QMK_SETTINGS = no
+QMK_SETTINGS = yes
 KEY_OVERRIDE_ENABLE = no