diff --git a/index.php b/index.php
index e79652b9d0..7ebb189f14 100644
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@ $config = yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/protected/humhub/config/common.php'),
     require(__DIR__ . '/protected/humhub/config/web.php'),
     (is_readable(__DIR__ . '/protected/config/dynamic.php')) ? require(__DIR__ . '/protected/config/dynamic.php') : [],
+    require(__DIR__ . '/protected/config/common.php'),
     require(__DIR__ . '/protected/config/web.php')
 );
 
diff --git a/protected/config/README.md b/protected/config/README.md
new file mode 100644
index 0000000000..f93380e5cf
--- /dev/null
+++ b/protected/config/README.md
@@ -0,0 +1,3 @@
+# Local Configuration
+
+Define own application specific configuration values here.
\ No newline at end of file
diff --git a/protected/config/common.php b/protected/config/common.php
new file mode 100644
index 0000000000..b62512838d
--- /dev/null
+++ b/protected/config/common.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
diff --git a/protected/config/console.php b/protected/config/console.php
index 0b67a5fe47..b62512838d 100644
--- a/protected/config/console.php
+++ b/protected/config/console.php
@@ -1,3 +1,4 @@
 <?php
 
-return [];
+return [
+];
diff --git a/protected/config/web.php b/protected/config/web.php
index c5c23e41e8..0cfa9637ec 100644
--- a/protected/config/web.php
+++ b/protected/config/web.php
@@ -1,4 +1,5 @@
 <?php
 
-return [];
+return [
+];
 
diff --git a/protected/humhub/components/Module.php b/protected/humhub/components/Module.php
index c834660613..e0590cfdaa 100644
--- a/protected/humhub/components/Module.php
+++ b/protected/humhub/components/Module.php
@@ -192,7 +192,7 @@ class Module extends \yii\base\Module
     {
         $migrationPath = $this->basePath . '/migrations';
         if (is_dir($migrationPath)) {
-            \humhub\commands\MigrateController::webMigrateUp();
+            \humhub\commands\MigrateController::webMigrateUp($migrationPath);
         }
     }
 
diff --git a/protected/humhub/components/bootstrap/ModuleAutoLoader.php b/protected/humhub/components/bootstrap/ModuleAutoLoader.php
index 31c1c97d29..f9fd8bc4cd 100644
--- a/protected/humhub/components/bootstrap/ModuleAutoLoader.php
+++ b/protected/humhub/components/bootstrap/ModuleAutoLoader.php
@@ -28,7 +28,8 @@ class ModuleAutoLoader implements BootstrapInterface
 
         if ($modules === false) {
             $modules = [];
-            foreach (array(Yii::getAlias('@app/modules'), Yii::getAlias('@humhub/modules')) as $modulePath) {
+            foreach (Yii::$app->params['moduleAutoloadPaths'] as $modulePath) {
+                $modulePath = Yii::getAlias($modulePath);
                 foreach (scandir($modulePath) as $moduleId) {
                     if ($moduleId == '.' || $moduleId == '..')
                         continue;
diff --git a/protected/humhub/config/common.php b/protected/humhub/config/common.php
index 5a5233cfed..7c21b5ed42 100644
--- a/protected/humhub/config/common.php
+++ b/protected/humhub/config/common.php
@@ -85,6 +85,7 @@ $config = [
     'params' => [
         'installed' => false,
         'dynamicConfigFile' => '@app/config/dynamic.php',
+        'moduleAutoloadPaths' => ['@app/modules', '@humhub/modules'],
         'availableLanguages' => [
             'en' => 'English (US)',
             'en_gb' => 'English (UK)',
diff --git a/protected/humhub/docs/guide/README.md b/protected/humhub/docs/guide/README.md
index 298e125a80..843531c371 100644
--- a/protected/humhub/docs/guide/README.md
+++ b/protected/humhub/docs/guide/README.md
@@ -16,6 +16,7 @@ Administration
 
 Administration - Topics
 -------------------------
+* [Advanced Configuration](admin-adv-config.md)
 * [Console](admin-adv-console.md)
 * [Search](admin-adv-search.md)
 * [XSendFile](admin-adv-xsendfile.md)
diff --git a/protected/humhub/docs/guide/admin-adv-config.md b/protected/humhub/docs/guide/admin-adv-config.md
new file mode 100644
index 0000000000..06ef1673ab
--- /dev/null
+++ b/protected/humhub/docs/guide/admin-adv-config.md
@@ -0,0 +1,31 @@
+Advanced Configuration
+======================
+
+You can overwrite the default HumHub / Yii configuration in folder `/protected/config`.  
+
+## File Overview
+
+- **common.php**  - Configuration used in Console & Web Application
+- **web.php** - Configuration used in Web Application only
+- **console.log** - Configuration used in Console Application only
+- **dynamic.php** - Dynamic generated configuration - do not edit manually!
+
+## Loading Order
+
+### Web Application
+
+1. humhub/config/common.php
+2. humhub/config/web.php
+3. config/dynamic.php
+4. **config/common.php**
+5. **config/web.php**
+
+
+### Console Application
+
+1. humhub/config/common.php
+2. humhub/config/console.php
+3. config/dynamic.php
+4. **config/common.php**
+5. **config/console.php**
+
diff --git a/protected/yii b/protected/yii
index 11205c09a6..ab69eda696 100644
--- a/protected/yii
+++ b/protected/yii
@@ -18,11 +18,11 @@ require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
-        require(__DIR__ . '/humhub/config/common.php'),
-        require(__DIR__ . '/humhub/config/console.php'),
-       (is_readable(__DIR__ . '/config/dynamic.php')) ? require(__DIR__ . '/config/dynamic.php') : [],
-      require(__DIR__ . '/config/console.php')
-
+    require(__DIR__ . '/humhub/config/common.php'),
+    require(__DIR__ . '/humhub/config/console.php'),
+    (is_readable(__DIR__ . '/config/dynamic.php')) ? require(__DIR__ . '/config/dynamic.php') : [],
+    require(__DIR__ . '/config/common.php'),
+    require(__DIR__ . '/config/console.php')
 );
 
 $application = new humhub\components\console\Application($config);