diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index 4a8f8323..bb7fb4d1 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -166,6 +166,13 @@ def get_actions(setup_mode, answers):
     # Set other keys
     for _sub_key in SETUP_ACTION_KEYS:
       _action[_sub_key] = _val.get(_sub_key, None)
+
+    # Handle "special" actions
+    if _key == 'Ninite bundle':
+      _action['KWArgs'] = {kw.lower(): kv for kw, kv in answers.items()}
+      _action['KWArgs'].pop('eset', None)
+
+    # Add to dict
     actions[_key] = _action
 
   return actions