diff --git a/phpBB/common.php b/phpBB/common.php
index 7ff06e68d7..cc33b29a09 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,6 +124,9 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
+// load extensions
+$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
+
 $template_locator = new phpbb_template_locator();
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
 
@@ -138,5 +141,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager($phpbb_root_path . 'includes/cron/task', $phpEx, $cache->get_driver());
+	$cron = new phpbb_cron_manager($phpbb_extension_manager, $cache->get_driver());
 }
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 956af75c81..e13524f922 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -73,6 +73,9 @@ if (isset($_GET['avatar']))
 	set_config(null, null, null, $config);
 	set_config_count(null, null, null, $config);
 
+	// load extensions
+	$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
+
 	$filename = request_var('avatar', '');
 	$avatar_group = false;
 	$exit = false;