diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index 68d4ac407e00..3d601f43c8ba 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -16,6 +16,7 @@ use App\Utils\CurlUtils;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use stdClass;
+use Carbon\Carbon;
 
 class LicenseController extends BaseController
 {
@@ -152,7 +153,7 @@ class LicenseController extends BaseController
     {
         $account = auth()->user()->company()->account;
 
-        if($account->plan == 'white_label' && $account->plan_expires->lt(now())){
+        if($account->plan == 'white_label' && Carbon::parse($account->plan_expires)->lt(now())){
             $account->plan = null;
             $account->plan_expires = null;
             $account->save();
diff --git a/app/Jobs/Util/VersionCheck.php b/app/Jobs/Util/VersionCheck.php
index cf57babc1a75..32dc7a2ac674 100644
--- a/app/Jobs/Util/VersionCheck.php
+++ b/app/Jobs/Util/VersionCheck.php
@@ -18,6 +18,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Carbon\Carbon;
 
 class VersionCheck implements ShouldQueue
 {
@@ -49,7 +50,7 @@ class VersionCheck implements ShouldQueue
             if(!$account)
                 return;
 
-            if($account->plan == 'white_label' && $account->plan_expires && $account->plan_expires->lt(now())){
+            if($account->plan == 'white_label' && $account->plan_expires && Carbon::parse($account->plan_expires)->lt(now())){
                 $account->plan = null;
                 $account->plan_expires = null;
                 $account->save();
diff --git a/app/Models/Account.php b/app/Models/Account.php
index c062ef6dbf54..5984d1f15e9d 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -55,7 +55,7 @@ class Account extends BaseModel
         'promo_expires',
         'discount_expires',
         'trial_started',
-        'plan_expires'
+        // 'plan_expires'
     ];
 
     const PLAN_FREE = 'free';
@@ -120,6 +120,11 @@ class Account extends BaseModel
         return $this->hasMany(CompanyUser::class);
     }
 
+    public function owner()
+    {
+        return $this->hasMany(CompanyUser::class)->where('is_owner', true)->first() ? $this->hasMany(CompanyUser::class)->where('is_owner', true)->first()->user : false;
+    }
+
     public function getPlan()
     {
         return $this->plan ?: '';
diff --git a/app/Models/Presenters/UserPresenter.php b/app/Models/Presenters/UserPresenter.php
index dd5f079db5ac..bf45ef5870f4 100644
--- a/app/Models/Presenters/UserPresenter.php
+++ b/app/Models/Presenters/UserPresenter.php
@@ -21,6 +21,10 @@ class UserPresenter extends EntityPresenter
      */
     public function name()
     {
+
+        if(!$this->entity)
+            return "No User Object Available";
+        
         $first_name = isset($this->entity->first_name) ? $this->entity->first_name : '';
         $last_name = isset($this->entity->last_name) ? $this->entity->last_name : '';