diff --git a/files/download.php b/files/download.php
index f99b8d567e94eae507fcd24992844708a0f2be03..f7fbcd0f85724f561419912da1ff57b0f6281d39 100644
--- a/files/download.php
+++ b/files/download.php
@@ -44,6 +44,7 @@ if(!OC_FILESYSTEM::file_exists($filename)){
 $ftype=OC_FILESYSTEM::getMimeType( $filename );
 
 header('Content-Type:'.$ftype);
+header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 header('Expires: 0');
 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 header('Pragma: public');
diff --git a/lib/base.php b/lib/base.php
index acdea093d917d77e35b5459727c3a858f1906654..2ed232cff2c24f4114fbdfe1b05c8dbaec80d309 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -91,7 +91,7 @@ require_once('plugin.php');
 
 $error=(count(OC_UTIL::checkServer())>0);
 
-if(!$error){
+if(!$error and OC_CONFIG::getValue('installed',false)){
 	OC_PLUGIN::loadPlugins( "" );
 }