diff --git a/app/Http/Controllers/Admin/BonusScoreDefinitionController.php b/app/Http/Controllers/Admin/BonusScoreDefinitionController.php
index b7f600c..73ad346 100644
--- a/app/Http/Controllers/Admin/BonusScoreDefinitionController.php
+++ b/app/Http/Controllers/Admin/BonusScoreDefinitionController.php
@@ -84,7 +84,7 @@ class BonusScoreDefinitionController extends Controller
     public function judges()
     {
         $bonusScores = BonusScoreDefinition::all();
-        $users = User::all();
+        $users = User::orderBy('last_name')->orderBy('first_name')->get();
 
         return view('admin.bonus-scores.judge-assignments', compact('bonusScores', 'users'));
     }
diff --git a/app/Models/User.php b/app/Models/User.php
index 4c0a9ab..b1c4697 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -129,7 +129,7 @@ class User extends Authenticatable implements MustVerifyEmail
 
     public function isJudge(): bool
     {
-        return $this->judgingAssignments()->count() > 0;
+        return $this->judgingAssignments()->count() > 0 || $this->bonusJudgingAssignments()->count() > 0;
     }
 
     /**