diff --git a/src/Config.py b/src/Config.py
index f18ce94e..7ee7710e 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -224,6 +224,7 @@ class Config(object):
         self.parser.add_argument("--fix_float_decimals", help='Fix content.json modification date float precision on verification',
                                  type='bool', choices=[True, False], default=fix_float_decimals)
         self.parser.add_argument("--db_mode", choices=["speed", "security"], default="speed")
+        self.parser.add_argument("--download_optional", choices=["manual", "auto"], default="manual")
 
         self.parser.add_argument('--coffeescript_compiler', help='Coffeescript compiler for developing', default=coffeescript,
                                  metavar='executable_path')
diff --git a/src/Site/Site.py b/src/Site/Site.py
index 10997b04..8819ada5 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -96,6 +96,8 @@ class Site(object):
                 "own": False, "serving": True, "permissions": [],
                 "added": int(time.time()), "optional_downloaded": 0, "size_optional": 0
             }  # Default
+            if config.download_optional == "auto":
+                self.settings["autodownloadoptional"] = True
 
         # Add admin permissions to homepage
         if self.address == config.homepage and "ADMIN" not in self.settings["permissions"]: