diff --git a/application/config/database.php b/application/config/database.php
index 79b48cb44..77cdc502b 100755
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -1,5 +1,6 @@
 <?php
 defined('BASEPATH') OR exit('No direct script access allowed');
+defined('DB_HOST') OR require_once './config/system.config.inc.php'; // For CLI-Migrations
 
 /*
 | -------------------------------------------------------------------
diff --git a/application/config/migration.php b/application/config/migration.php
index 840fa7a40..61ff18b8a 100755
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -11,7 +11,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | and disable it back when you're done.
 |
 */
-$config['migration_enabled'] = TRUE;
+$config['migration_enabled'] = FALSE;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/migrations/20160101010103_create_basedb.php b/application/migrations/20160101010103_create_basedb.php
index 43b244c67..4895d2d76 100644
--- a/application/migrations/20160101010103_create_basedb.php
+++ b/application/migrations/20160101010103_create_basedb.php
@@ -6,12 +6,15 @@ class Migration_Create_basedb extends CI_Migration {
 
         public function up()
         {
-			$this->load->helper('file');
-            $sqlfile =  read_file('./system/fhcomplete3.0.sql');
-
-			if (!$this->db->simple_query($sqlfile))
+			if (!$this->db->table_exists('tbl_person'))
 			{
-					echo "Error creating Basis DB-Schema!";
+				$this->load->helper('file');
+		        $sqlfile =  read_file('./system/fhcomplete3.0.sql');
+
+				if (!$this->db->simple_query($sqlfile))
+				{
+						echo "Error creating Basis DB-Schema!";
+				}
 			}
         }