diff --git a/app/Filament/Resources/User/UserResource.php b/app/Filament/Resources/User/UserResource.php
index 50384478..68c3bf21 100644
--- a/app/Filament/Resources/User/UserResource.php
+++ b/app/Filament/Resources/User/UserResource.php
@@ -6,9 +6,10 @@ use Filament\Schemas\Schema;
 use Filament\Forms\Components\TextInput;
 use App\Filament\Resources\User\UserResource\Pages\CreateUser;
 use Filament\Forms\Components\Select;
+use Filament\Tables\Columns\BadgeColumn;
+use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\Column;
-use Filament\Tables\Columns\BadgeColumn;
 use Filament\Tables\Filters\Filter;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Actions\ViewAction;
@@ -29,7 +30,6 @@ use App\Models\User;
 use App\Repositories\UserRepository;
 use Filament\Actions\Action;
 use Filament\Forms;
-use Filament\Forms\Components\Grid;
 use Filament\Resources\Resource;
 use Filament\Tables\Table;
 use Filament\Tables;
@@ -89,6 +89,7 @@ class UserResource extends Resource
 
     public static function table(Table $table): Table
     {
+        $yesNoOptions = ['success' => 'yes', 'danger' => 'no'];
         return $table
             ->columns([
                 TextColumn::make('id')->sortable()->searchable(),
@@ -104,10 +105,16 @@ class UserResource extends Resource
                 TextColumn::make('downloaded')->label('Downloaded')
                     ->formatStateUsing(fn(Column $column) => $column->getRecord()->downloadedText)
                     ->sortable()->label(__("label.downloaded")),
-                BadgeColumn::make('status')->colors(['success' => 'confirmed', 'warning' => 'pending'])->label(__("label.user.status")),
-                BadgeColumn::make('enabled')->colors(['success' => 'yes', 'danger' => 'no'])->label(__("label.user.enabled")),
-                BadgeColumn::make('downloadpos')->colors(['success' => 'yes', 'danger' => 'no'])->label(__("label.user.downloadpos")),
-                BadgeColumn::make('parked')->colors(['success' => 'yes', 'danger' => 'no'])->label(__("label.user.parked")),
+                TextColumn::make('status')->badge()->colors(['success' => 'confirmed', 'warning' => 'pending'])->label(__("label.user.status")),
+                TextColumn::make('enabled')->badge()->colors($yesNoOptions)->label(__("label.user.enabled")),
+                TextColumn::make('downloadpos')->badge()->colors($yesNoOptions)->label(__("label.user.downloadpos")),
+                TextColumn::make('parked')->badge()->colors($yesNoOptions)->label(__("label.user.parked")),
+                TextColumn::make('isDonating')
+                    ->state(fn ($record): string => $record->isDonating() ? 'yes' : 'no')
+                    ->badge()
+                    ->colors($yesNoOptions)
+                    ->label(__("label.user.is_donating"))
+                ,
                 TextColumn::make('added')->sortable()->dateTime('Y-m-d H:i')->label(__("label.added")),
                 TextColumn::make('last_access')->dateTime('Y-m-d H:i')->label(__("label.last_access")),
             ])
@@ -122,11 +129,23 @@ class UserResource extends Resource
                         return $query->when($data['id'], fn (Builder $query, $id) => $query->where("id", $id));
                     })
                 ,
-                SelectFilter::make('class')->options(array_column(User::$classes, 'text'))->label(__('label.user.class')),
+                SelectFilter::make('class')->options(User::listClass())->label(__('label.user.class')),
                 SelectFilter::make('status')->options(['confirmed' => 'confirmed', 'pending' => 'pending'])->label(__('label.user.status')),
                 SelectFilter::make('enabled')->options(self::$yesOrNo)->label(__('label.user.enabled')),
                 SelectFilter::make('downloadpos')->options(self::$yesOrNo)->label(__('label.user.downloadpos')),
                 SelectFilter::make('parked')->options(self::$yesOrNo)->label(__('label.user.parked')),
+                SelectFilter::make('is_donating')
+                    ->options(self::$yesOrNo)
+                    ->label(__('label.user.is_donating'))
+                    ->query(function (Builder $query, array $data) {
+                        if ($data['value'] === 'yes') {
+                            return $query->donating();
+                        } else if ($data['value'] === 'no') {
+                            return $query->where('donor', 'no');
+                        }
+                        return $query;
+                    })
+                ,
             ])
             ->recordActions([
                 ViewAction::make(),
diff --git a/app/Models/User.php b/app/Models/User.php
index 590bc7f0..2d61f611 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -364,6 +364,14 @@ class User extends Authenticatable implements FilamentUser, HasName
         return $query->where('status', self::STATUS_CONFIRMED)->where('enabled', self::ENABLED_YES);
     }
 
+    public function scopeDonating(Builder $query): Builder
+    {
+        return $query->where('donor', 'yes')->where(function (Builder $query) {
+            return $query->whereNull('donoruntil')
+                ->orWhere('donoruntil', '0000-00-00 00:00:00')
+                ->orWhere('donoruntil', '>=', now());
+        });
+    }
 
     public function exams()
     {
diff --git a/resources/lang/en/label.php b/resources/lang/en/label.php
index 376180bc..e33091f4 100644
--- a/resources/lang/en/label.php
+++ b/resources/lang/en/label.php
@@ -210,6 +210,7 @@ return [
         'parked' => 'Parked',
         'offer_allowed_count' => 'Offer allowed count',
         'tmp_invites' => 'Temporary invite',
+        'is_donating' => 'Donor',
     ],
     'medal' => [
         'label' => 'Medal',
diff --git a/resources/lang/zh_CN/label.php b/resources/lang/zh_CN/label.php
index c3632bc7..34a81cf4 100644
--- a/resources/lang/zh_CN/label.php
+++ b/resources/lang/zh_CN/label.php
@@ -250,6 +250,7 @@ return [
         'parked' => '挂起',
         'offer_allowed_count' => '候选通过数',
         'tmp_invites' => '临时邀请',
+        'is_donating' => '捐赠',
     ],
     'medal' => [
         'label' => '勋章',
diff --git a/resources/lang/zh_TW/label.php b/resources/lang/zh_TW/label.php
index 77521adc..da6f3699 100644
--- a/resources/lang/zh_TW/label.php
+++ b/resources/lang/zh_TW/label.php
@@ -209,6 +209,7 @@ return [
         'parked' => '掛起',
         'offer_allowed_count' => '候選通過數',
         'tmp_invites' => '臨時邀請',
+        'is_donating' => '捐贈',
     ],
     'medal' => [
         'label' => '勛章',