diff --git a/app/DataMapper/ClientRegistrationFields.php b/app/DataMapper/ClientRegistrationFields.php
index f56252f6fd70..23106c42b08d 100644
--- a/app/DataMapper/ClientRegistrationFields.php
+++ b/app/DataMapper/ClientRegistrationFields.php
@@ -32,7 +32,7 @@ class ClientRegistrationFields
             ],
             [
                 'key' => 'phone',
-                'required' => true
+                'required' => false
             ],
             [
                 'key' => 'password',
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 20634db141fa..000cfdf98a31 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -260,14 +260,14 @@ class LoginController extends BaseController
                 ->increment()
                 ->batch();
 
-            SystemLogger::dispatch(
-                json_encode(['ip' => request()->getClientIp()]),
-                SystemLog::CATEGORY_SECURITY,
-                SystemLog::EVENT_USER,
-                SystemLog::TYPE_LOGIN_FAILURE,
-                null,
-                Company::first(),
-            );
+            // SystemLogger::dispatch(
+            //     json_encode(['ip' => request()->getClientIp()]),
+            //     SystemLog::CATEGORY_SECURITY,
+            //     SystemLog::EVENT_USER,
+            //     SystemLog::TYPE_LOGIN_FAILURE,
+            //     null,
+            //     Company::first(),
+            // );
 
             $this->incrementLoginAttempts($request);
 
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 54b04308325e..5ac5ed157a78 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -499,7 +499,7 @@ class CompanyController extends BaseController
 
             $account->delete();
 
-            if(Ninja::isHosted() && $request->has('cancellation_message') && strlen($request->input('cancellation_message')) > 1)
+            if(Ninja::isHosted())
                 \Modules\Admin\Jobs\Account\NinjaDeletedAccount::dispatch($account_key, $request->all());
 
             LightLogs::create(new AccountDeleted())
diff --git a/tests/Unit/SubscriptionsCalcTest.php b/tests/Unit/SubscriptionsCalcTest.php
index 61a0adad81bd..98e07240bef3 100644
--- a/tests/Unit/SubscriptionsCalcTest.php
+++ b/tests/Unit/SubscriptionsCalcTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://opensource.org/licenses/AAL
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Helpers\Invoice\ProRata;
@@ -30,7 +31,7 @@ class SubscriptionsCalcTest extends TestCase
      *
      * No method can guarantee against false positives.
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -39,7 +40,7 @@ class SubscriptionsCalcTest extends TestCase
 
     public function testCalcUpgradePrice()
     {
-    
+
         $subscription = Subscription::factory()->create([
             'company_id' => $this->company->id,
             'user_id' => $this->user->id,
@@ -67,7 +68,7 @@ class SubscriptionsCalcTest extends TestCase
             'discount' => 0,
             'subscription_id' => $subscription->id,
             'date' => '2021-01-01',
-        ]); 
+        ]);
 
         $invoice = $invoice->calc()->getInvoice();
 
@@ -89,23 +90,17 @@ class SubscriptionsCalcTest extends TestCase
         $this->assertEquals(10, $invoice->amount);
         $this->assertEquals(0, $invoice->balance);
 
-        $pro_rata = new ProRata();
+        $pro_rata = new ProRata;
 
         $refund = $pro_rata->refund($invoice->amount, Carbon::parse('2021-01-01'), Carbon::parse('2021-01-06'), $subscription->frequency_id);
 
         $this->assertEquals(1.61, $refund);
 
-        $pro_rata = new ProRata();
+        $pro_rata = new ProRata;
 
         $upgrade = $pro_rata->charge($target->price, Carbon::parse('2021-01-01'), Carbon::parse('2021-01-06'), $subscription->frequency_id);
 
         $this->assertEquals(3.23, $upgrade);
 
-        // $net_upgrade_price = $sub_calculator->calcUpgradePlan();
-
-        // $this->assertEquals(1.62, $net_upgrade_price);
-
     }
-
-
-}
\ No newline at end of file
+}