diff --git a/mayan/apps/common/management/commands/initialsetup.py b/mayan/apps/common/management/commands/initialsetup.py
index d8e2694537..1eeb3de98a 100644
--- a/mayan/apps/common/management/commands/initialsetup.py
+++ b/mayan/apps/common/management/commands/initialsetup.py
@@ -33,7 +33,7 @@ class Command(management.BaseCommand):
         )
     def initialize_system(self, force=False):
         system_path = os.path.join(settings.MEDIA_ROOT, SYSTEM_DIR)
-        settings_path = os.path.join(settings.MEDIA_ROOT, 'settings')
+        settings_path = os.path.join(settings.MEDIA_ROOT, 'mayan_settings')
         secret_key_file_path = os.path.join(system_path, SECRET_KEY_FILENAME)
 
         if not os.path.exists(settings.MEDIA_ROOT) or force:
@@ -44,6 +44,9 @@ class Command(management.BaseCommand):
                 if exception.errno == errno.EEXIST and force:
                     pass
 
+            # Touch media/__init__.py
+            Command.touch(os.path.join(settings.MEDIA_ROOT, '__init__.py'))
+
             # Create media/settings
             try:
                 os.makedirs(settings_path)