diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 23f2c13d849e..1a1bbd1a745c 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -44,7 +44,7 @@ class InvoiceController extends Controller
      */
     public function index(InvoiceFilters $filters, Builder $builder)
     {//
-        $invoices = Invoice::filter($filters);
+        $invoices = Invoice::filter($filters)->with('client', 'client.country');
 
         if (request()->ajax()) {
 
@@ -57,9 +57,9 @@ class InvoiceController extends Controller
                 ->editColumn('status_id', function ($invoice){
                     return Invoice::badgeForStatus($invoice->status);
                 })->editColumn('invoice_date', function ($invoice){
-                    return $this->createClientDate($invoice->invoice_date, $invoice->client->timezone()->name)->format($invoice->client->date_format());
+                    return $this->formatDate($invoice->invoice_date, $invoice->client->date_format());
                 })->editColumn('due_date', function ($invoice){
-                    return $this->createClientDate($invoice->due_date, $invoice->client->timezone()->name)->format($invoice->client->date_format());
+                    return $this->formatDate($invoice->due_date, $invoice->client->date_format());
                 })->editColumn('balance', function ($invoice) {
                     return Number::formatMoney($invoice->balance, $invoice->client->currency(), $invoice->client->country, $invoice->client->getMergedSettings());
                 })->editColumn('amount', function ($invoice) {
diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php
index 5ec48e4b5ee8..50b7969b32ad 100644
--- a/app/Utils/Traits/MakesDates.php
+++ b/app/Utils/Traits/MakesDates.php
@@ -52,6 +52,22 @@ trait MakesDates
 
 	}
 
+	/**
+	 * Formats a date
+	 * @param  Carbon/String $date   Carbon object or date string
+	 * @param  string $format The date display format
+	 * @return string         The formatted date
+	 */
+	public function formatDate($date, string $format) :string
+	{
+
+		if(is_string($date))
+			$date = $this->convertToDateObject($date);
+
+		return $date->format($format);
+
+	}
+
 	private function convertToDateObject($date)
 	{
 
@@ -59,4 +75,6 @@ trait MakesDates
 
 	}
 
+
+
 }
\ No newline at end of file
diff --git a/database/seeds/RandomDataSeeder.php b/database/seeds/RandomDataSeeder.php
index e7814791e079..32aa4e33c2f9 100644
--- a/database/seeds/RandomDataSeeder.php
+++ b/database/seeds/RandomDataSeeder.php
@@ -67,7 +67,7 @@ class RandomDataSeeder extends Seeder
         ClientContact::create([
             'first_name' => $faker->firstName,
             'last_name' => $faker->lastName,
-            'email' => $faker->email,
+            'email' => config('ninja.testvars.username'),
             'company_id' => $company->id,
             'password' => Hash::make(config('ninja.testvars.password')),
             'email_verified_at' => now(),