diff --git a/src/app/Console/Commands/WalletCharge.php b/src/app/Console/Commands/WalletCharge.php
index 5408b723..a41b2333 100644
--- a/src/app/Console/Commands/WalletCharge.php
+++ b/src/app/Console/Commands/WalletCharge.php
@@ -1,75 +1,76 @@
 <?php
 
 namespace App\Console\Commands;
 
 use App\Wallet;
 use Illuminate\Console\Command;
 
 class WalletCharge extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'wallet:charge {wallet?}';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = 'Charge wallets';
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         if ($wallet = $this->argument('wallet')) {
             // Find specified wallet by ID
             $wallet = Wallet::find($wallet);
 
             if (!$wallet || !$wallet->owner) {
                 return 1;
             }
 
             $wallets = [$wallet];
         } else {
             // Get all wallets, excluding deleted accounts
-            $wallets = Wallet::join('users', 'users.id', '=', 'wallets.user_id')
+            $wallets = Wallet::select('wallets.*')
+                ->join('users', 'users.id', '=', 'wallets.user_id')
                 ->whereNull('users.deleted_at')
                 ->get();
         }
 
         foreach ($wallets as $wallet) {
             $charge = $wallet->chargeEntitlements();
 
             if ($charge > 0) {
                 $this->info(
                     "Charged wallet {$wallet->id} for user {$wallet->owner->email} with {$charge}"
                 );
 
                 // Top-up the wallet if auto-payment enabled for the wallet
                 \App\Jobs\WalletCharge::dispatch($wallet);
             }
 
             if ($wallet->balance < 0) {
                 // Check the account balance, send notifications, suspend, delete
                 \App\Jobs\WalletCheck::dispatch($wallet);
             }
         }
     }
 }
diff --git a/src/tests/Feature/Jobs/WalletCheckTest.php b/src/tests/Feature/Jobs/WalletCheckTest.php
index 5257e2b7..565bbf38 100644
--- a/src/tests/Feature/Jobs/WalletCheckTest.php
+++ b/src/tests/Feature/Jobs/WalletCheckTest.php
@@ -1,245 +1,264 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Jobs\WalletCheck;
 use App\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
 class WalletCheckTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $ned = $this->getTestUser('ned@kolab.org');
         if ($ned->isSuspended()) {
             $ned->status -= User::STATUS_SUSPENDED;
             $ned->save();
         }
 
         $this->deleteTestUser('wallet-check@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $ned = $this->getTestUser('ned@kolab.org');
         if ($ned->isSuspended()) {
             $ned->status -= User::STATUS_SUSPENDED;
             $ned->save();
         }
 
         $this->deleteTestUser('wallet-check@kolabnow.com');
 
         parent::tearDown();
     }
 
     /**
      * Test job handle, initial negative-balance notification
      */
     public function testHandleInitial(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance is not negative
         $wallet->balance = 0;
         $wallet->save();
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
-        // Balance is not negative now
+        // Balance is negative now
         $wallet->balance = -100;
         $wallet->save();
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Balance turned negative 2 hours ago, expect mail sent
         $wallet->setSetting('balance_negative_since', $now->subHours(2)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalance::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalance::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
+
+        // Test the migration scenario where a negative wallet has no balance_negative_since set yet
+        Mail::fake();
+        $wallet->setSetting('balance_negative_since', null);
+        $wallet->setSetting('balance_warning_initial', null);
+
+        $job = new WalletCheck($wallet);
+        $job->handle();
+
+        // Assert the mail was sent to the user's email, but not to his external email
+        Mail::assertSent(\App\Mail\NegativeBalance::class, 1);
+        Mail::assertSent(\App\Mail\NegativeBalance::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
+        });
+
+        $wallet->refresh();
+        $today_regexp = '/' . Carbon::now()->toDateString() . ' [0-9]{2}:[0-9]{2}:[0-9]{2}/';
+        $this->assertRegExp($today_regexp, $wallet->getSetting('balance_negative_since'));
+        $this->assertRegExp($today_regexp, $wallet->getSetting('balance_warning_initial'));
     }
 
     /**
      * Test job handle, reminder notification
      */
     public function testHandleReminder(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+1 days ago, expect mail sent
         $wallet->setSetting('balance_negative_since', $now->subDays(7 + 1)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalanceReminder::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceReminder::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, account suspending
      */
     public function testHandleSuspended(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+14+1 days ago, expect mail sent
         $days = 7 + 14 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalanceSuspended::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceSuspended::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         // Check that it has been suspended
         $this->assertTrue($user->fresh()->isSuspended());
 
         // TODO: Test that group account members/domain are also being suspended
         /*
         foreach ($wallet->entitlements()->fresh()->get() as $entitlement) {
             if (
                 $entitlement->entitleable_type == \App\Domain::class
                 || $entitlement->entitleable_type == \App\User::class
             ) {
                 $this->assertTrue($entitlement->entitleable->isSuspended());
             }
         }
         */
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, final warning before delete
      */
     public function testHandleBeforeDelete(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+14+21-3+1 days ago, expect mail sent
         $days = 7 + 14 + 21 - 3 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, and his external email
         Mail::assertSent(\App\Mail\NegativeBalanceBeforeDelete::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceBeforeDelete::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && $mail->hasCc('external@test.com');
         });
 
         // Check that it has not been deleted yet
         $this->assertFalse($user->fresh()->isDeleted());
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, account delete
      */
     public function testHandleDelete(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('wallet-check@kolabnow.com');
         $wallet = $user->wallets()->first();
         $wallet->balance = -100;
         $wallet->save();
         $now = Carbon::now();
 
         $package = \App\Package::where('title', 'kolab')->first();
         $user->assignPackage($package);
 
         $this->assertFalse($user->isDeleted());
         $this->assertCount(4, $user->entitlements()->get());
 
         // Balance turned negative 7+14+21+1 days ago, expect mail sent
         $days = 7 + 14 + 21 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Check that it has not been deleted
         $this->assertTrue($user->fresh()->trashed());
         $this->assertCount(0, $user->entitlements()->get());
 
         // TODO: Test it deletes all members of the group account
     }
 }