diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c859e8a153fa..1e88741b4878 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -28,6 +28,9 @@ use Google_Client;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+use PragmaRX\Google2FA\Google2FA;
 use Turbo124\Beacon\Facades\LightLogs;
 
 class LoginController extends BaseController
@@ -159,19 +162,40 @@ class LoginController extends BaseController
         }
 
         if ($this->attemptLogin($request)) {
+
             LightLogs::create(new LoginSuccess())
                 ->increment()
                 ->batch();
 
             $user = $this->guard()->user();
 
+            //if user has 2fa enabled - lets check this now:
+
+            if($user->google_2fa_secret)
+            {
+                $google2fa = new Google2FA();
+
+                if(!$google2fa->verifyKey(decrypt($user->google_2fa_secret), $request->input('one_time_password')))
+                {
+                    return response()
+                    ->json(['message' => ctrans('texts.invalid_one_time_password')], 401)
+                    ->header('X-App-Version', config('ninja.app_version'))
+                    ->header('X-Api-Version', config('ninja.minimum_client_version'));
+                }
+
+            }
+
             $user->setCompany($user->account->default_company);
+            $timeout = auth()->user()->company()->default_password_timeout;
+            Cache::put(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
 
             $cu = CompanyUser::query()
                   ->where('user_id', auth()->user()->id);
 
             return $this->listResponse($cu);
+
         } else {
+
             LightLogs::create(new LoginFailure())
                 ->increment()
                 ->batch();
@@ -182,6 +206,7 @@ class LoginController extends BaseController
             ->json(['message' => ctrans('texts.invalid_credentials')], 401)
             ->header('X-App-Version', config('ninja.app_version'))
             ->header('X-Api-Version', config('ninja.minimum_client_version'));
+
         }
     }
 
diff --git a/app/Http/Controllers/TwoFactorController.php b/app/Http/Controllers/TwoFactorController.php
index 4efe18b8d120..c1f6a8f5c1e9 100644
--- a/app/Http/Controllers/TwoFactorController.php
+++ b/app/Http/Controllers/TwoFactorController.php
@@ -62,11 +62,11 @@ class TwoFactorController extends BaseController
 
         } elseif (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) {
 
-            return response()->json(['message' => ctrans('texts.invalid_one_time_password')]);
+            return response()->json(['message' => ctrans('texts.invalid_one_time_password')], 400);
 
         } 
             
-        return response()->json(['message' => 'No phone record or user is not confirmed']);
+        return response()->json(['message' => 'No phone record or user is not confirmed'], 400);
         
     }
     
diff --git a/app/Jobs/Ninja/SendReminders.php b/app/Jobs/Ninja/SendReminders.php
index ea01af1c2071..023869674ab8 100644
--- a/app/Jobs/Ninja/SendReminders.php
+++ b/app/Jobs/Ninja/SendReminders.php
@@ -16,6 +16,7 @@ use App\Events\Invoice\InvoiceWasEmailed;
 use App\Jobs\Entity\EmailEntity;
 use App\Jobs\Util\WebHookHandler;
 use App\Libraries\MultiDB;
+use App\Models\Account;
 use App\Models\Invoice;
 use App\Models\Webhook;
 use App\Utils\Ninja;
@@ -207,7 +208,7 @@ class SendReminders implements ShouldQueue
         $invoice->invitations->each(function ($invitation) use ($template, $invoice) {
 
             //only send if enable_reminder setting is toggled to yes
-            if ($this->checkSendSetting($invoice, $template)) {
+            if ($this->checkSendSetting($invoice, $template) && $invoice->company->account->hasFeature(Account::FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
                 nlog("firing email");
 
                 EmailEntity::dispatchNow($invitation, $invitation->company, $template);
diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php
index 621287a492f9..de433a4c826f 100644
--- a/app/Jobs/User/UserEmailChanged.php
+++ b/app/Jobs/User/UserEmailChanged.php
@@ -80,9 +80,10 @@ class UserEmailChanged implements ShouldQueue
 
         NinjaMailerJob::dispatch($nmo);
 
-        $nmo->to_user = $this->new_user;
-        
-        NinjaMailerJob::dispatch($nmo);
+        // $nmo->to_user = $this->new_user;
+        // NinjaMailerJob::dispatch($nmo);
+
+        $this->new_user->service()->invite($this->company);
 
     }
 
diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php
index 835c9d47aefa..d6641ed6a83c 100644
--- a/app/Mail/Engine/CreditEmailEngine.php
+++ b/app/Mail/Engine/CreditEmailEngine.php
@@ -88,14 +88,14 @@ class CreditEmailEngine extends BaseEmailEngine
             ->setViewText(ctrans('texts.view_credit'))
             ->setInvitation($this->invitation);
 
-        if ($this->client->getSetting('pdf_email_attachment') !== false) {
+        if ($this->client->getSetting('pdf_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
             $this->setAttachments([$this->credit->pdf_file_path()]);
 
             // $this->setAttachments(['path' => $this->credit->pdf_file_path(), 'name' => basename($this->credit->pdf_file_path())]);
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false){
+        if($this->client->getSetting('document_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
 
             // Storage::url
             foreach($this->credit->documents as $document){
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index 40cd3eee7211..e0907d2e7b35 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -12,6 +12,7 @@
 namespace App\Mail\Engine;
 
 use App\DataMapper\EmailTemplateDefaults;
+use App\Models\Account;
 use App\Utils\HtmlEngine;
 use App\Utils\Number;
 
@@ -97,14 +98,14 @@ class InvoiceEmailEngine extends BaseEmailEngine
             ->setViewText(ctrans('texts.view_invoice'))
             ->setInvitation($this->invitation);
 
-        if ($this->client->getSetting('pdf_email_attachment') !== false) {
+        if ($this->client->getSetting('pdf_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
             $this->setAttachments([$this->invoice->pdf_file_path()]);
             // $this->setAttachments(['path' => $this->invoice->pdf_file_path(), 'name' => basename($this->invoice->pdf_file_path())]);
 
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false){
+        if($this->client->getSetting('document_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
 
             // Storage::url
             foreach($this->invoice->documents as $document){
diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php
index 5751cdf5acae..9d85d8b68dc3 100644
--- a/app/Mail/Engine/QuoteEmailEngine.php
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@@ -89,14 +89,14 @@ class QuoteEmailEngine extends BaseEmailEngine
             ->setInvitation($this->invitation);
 
 
-        if ($this->client->getSetting('pdf_email_attachment') !== false) {
+        if ($this->client->getSetting('pdf_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
             $this->setAttachments([$this->quote->pdf_file_path()]);
             //$this->setAttachments(['path' => $this->quote->pdf_file_path(), 'name' => basename($this->quote->pdf_file_path())]);
 
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false){
+        if($this->client->getSetting('document_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
 
             // Storage::url
             foreach($this->quote->documents as $document){
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 5415440cd735..5d470680aab5 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -74,7 +74,7 @@ class Gateway extends StaticModel
      * Returns an array of methods and the gatewaytypes possible
      *
      * @return array
-     *///todo remove methods replace with gatewaytype:: and then nest refund / token billing
+     */
     public function getMethods()
     {
         switch ($this->id) {
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index 742a4769576c..f8e93a45578d 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -78,6 +78,7 @@ class AccountTransformer extends EntityTransformer
             'is_docker' => (bool) config('ninja.is_docker'),
             'is_scheduler_running' => (bool) $account->is_scheduler_running,
             'default_company_id' => (string) $this->encodePrimaryKey($account->default_company_id),
+            'disable_auto_update' => (bool) config('ninja.disable_auto_update'),
         ];
     }
 
diff --git a/app/Utils/Traits/SavesDocuments.php b/app/Utils/Traits/SavesDocuments.php
index 8ac249650b37..2451c89e6698 100644
--- a/app/Utils/Traits/SavesDocuments.php
+++ b/app/Utils/Traits/SavesDocuments.php
@@ -19,6 +19,7 @@ trait SavesDocuments
 {
     public function saveDocuments($document_array, $entity, $is_public = true)
     {
+
         if ($entity instanceof Company) {
             $account = $entity->account;
             $company = $entity;
diff --git a/composer.json b/composer.json
index 62af533b25b6..edd90002a8e2 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,7 @@
         "wildbit/swiftmailer-postmark": "^3.3"
     },
     "require-dev": {
-        "php": "^7.4",
+        "php": "^7.3|^7.4",
         "anahkiasen/former": "^4.2",
         "barryvdh/laravel-debugbar": "^3.4",
         "brianium/paratest": "^6.1",
diff --git a/config/ninja.php b/config/ninja.php
index b2ad25be674d..35808bb21c8f 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -143,4 +143,5 @@ return [
     'v4_migration_version' => '4.5.31',
     'flutter_canvas_kit' => env('FLUTTER_CANVAS_KIT', false),
     'webcron_secret' => env('WEBCRON_SECRET', false),
+    'disable_auto_update' => env('DISABLE_AUTO_UPDATE', false),
 ];