diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php
index c3ceb8987e68..d78508f9ffd0 100644
--- a/app/Factory/CompanyFactory.php
+++ b/app/Factory/CompanyFactory.php
@@ -45,7 +45,7 @@ class CompanyFactory
         
         $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
         $company->default_password_timeout = 1800000;
-        $company->markdown_email_enabled = true;
+        $company->markdown_email_enabled = false;
 
         return $company;
     }
diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 1fa7486f19ad..8ecaf74a6df5 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -111,7 +111,7 @@ class SelfUpdateController extends BaseController
         }
 
         $this->testWritable();
-        $this->clearCacheDir();
+        // $this->clearCacheDir();
 
         copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'));
 
diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index e9d63984a4b6..6a9ac4f9a25a 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -64,7 +64,7 @@ class CreateCompany
         $company->custom_fields = new \stdClass;
         $company->default_password_timeout = 1800000;
         $company->client_registration_fields = ClientRegistrationFields::generate();
-        $company->markdown_email_enabled = true;
+        $company->markdown_email_enabled = false;
         
         if(Ninja::isHosted())
             $company->subdomain = MultiDB::randomSubdomainGenerator();