diff --git a/setup/cli/manage.php b/setup/cli/manage.php
index bfd59f9f0fe2e1b85fcf3cbbbac90744ea4b2290..83d715ac12f87de14aee5aa66bc80140c9bb44f6 100755
--- a/setup/cli/manage.php
+++ b/setup/cli/manage.php
@@ -46,8 +46,7 @@ class Manager extends Module {
                 if ($val == $action)
                     unset($argv[$idx]);
 
-            foreach (glob(dirname(__file__).'/modules/*.php') as $script)
-                include_once $script;
+            require_once dirname(__file__)."/modules/{$args['action']}.php";
             if (($module = Module::getInstance($action)))
                 return $module->_run($args['action']);
 
diff --git a/setup/cli/modules/file.php b/setup/cli/modules/file.php
index 3c9f434b745aee1e50dd3764136510cbfa4e1e47..2c6aa49a11027c52935048593ffddcf8bfa5a55a 100644
--- a/setup/cli/modules/file.php
+++ b/setup/cli/modules/file.php
@@ -48,6 +48,8 @@ class FileManager extends Module {
 
 
     function run($args, $options) {
+        if (!defined('OST_INSTALLED'))
+            $this->fail('Install your config file into `include/`');
         Bootstrap::connect();
         osTicket::start();