diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
index b6338633c775..184d09475c2b 100644
--- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
@@ -58,7 +58,7 @@ class ContactForgotPasswordController extends Controller
      */
     public function showLinkRequestForm(Request $request)
     {
-        $account_id = $request->get('account_id');
+        $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
         $account = Account::find($account_id);
         $company = $account->companies->first();
 
diff --git a/app/Http/Controllers/Auth/ContactResetPasswordController.php b/app/Http/Controllers/Auth/ContactResetPasswordController.php
index 7c32d664a1f0..f5a981ae1859 100644
--- a/app/Http/Controllers/Auth/ContactResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactResetPasswordController.php
@@ -68,7 +68,7 @@ class ContactResetPasswordController extends Controller
      */
     public function showResetForm(Request $request, $token = null)
     {
-        $account_id = $request->get('account_id');
+        $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
         $account = Account::find($account_id);
         $db = $account->companies->first()->db;
         $company = $account->companies->first();
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionController.php b/app/Http/Controllers/ClientPortal/SubscriptionController.php
index 6e637d8223eb..e668299ab74a 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionController.php
@@ -29,7 +29,9 @@ class SubscriptionController extends Controller
                 ->where('client_id', auth('contact')->user()->client->id)
                 ->where('company_id', auth('contact')->user()->client->company_id)
                 ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                ->where('is_deleted', 0)
                 ->whereNotNull('subscription_id')
+                ->withTrashed()
                 ->count();
 
                 if($count == 0)