diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index bb7fb4d1..b3e555b5 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -168,7 +168,10 @@ def get_actions(setup_mode, answers):
       _action[_sub_key] = _val.get(_sub_key, None)
 
     # Handle "special" actions
-    if _key == 'Ninite bundle':
+    if _key == 'KIT_NAME_FULL':
+      _key = KIT_NAME_FULL
+      _action['KWArgs'] = {'folder_path': global_vars['ClientDir']}
+    elif _key == 'Ninite bundle':
       _action['KWArgs'] = {kw.lower(): kv for kw, kv in answers.items()}
       _action['KWArgs'].pop('eset', None)