diff --git a/scipost_django/colleges/models/nomination.py b/scipost_django/colleges/models/nomination.py
index 7468a93812b91989163cc6179e26060bb96ee582..f76b17bce8a4c4900877dfd754031c5ea54caa3f 100644
--- a/scipost_django/colleges/models/nomination.py
+++ b/scipost_django/colleges/models/nomination.py
@@ -312,6 +312,12 @@ class FellowshipNominationVote(models.Model):
         (VOTE_DISAGREE, "Disagree"),
         (VOTE_VETO, "Veto"),
     )
+    VOTE_BS_CLASSES = {
+        VOTE_AGREE: "success",
+        VOTE_ABSTAIN: "warning",
+        VOTE_DISAGREE: "danger",
+        VOTE_VETO: "black",
+    }
 
     voting_round = models.ForeignKey(
         "colleges.FellowshipNominationVotingRound",
@@ -331,6 +337,10 @@ class FellowshipNominationVote(models.Model):
 
     objects = FellowshipNominationVoteQuerySet.as_manager()
 
+    @property
+    def get_vote_bs_class(self):
+        return self.VOTE_BS_CLASSES[self.vote]
+
     class Meta:
         constraints = [
             models.UniqueConstraint(
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html b/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
index 45657235153e04d5f784d141bae01fcebcacf7c8..a4425b79c7734737abcfde96d39f527648f9fc11 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
@@ -1,6 +1,6 @@
 <h3>Cast your vote:</h3>
 
-{% for vote_option, color in vote_options %}
+{% for vote_option, color in VOTE_BS_CLASSES.items %}
 
   <form hx-post="{% url 'colleges:_hx_nomination_vote' round_id=voting_round.id %}"
         hx-target="#nomination-{{ voting_round.nomination.id }}-vote">
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html b/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
index f14bba5b35efd1b39d979981ec73b59d594e41d8..edb03507be12b4179a322a48feb76218026ead4c 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
@@ -41,16 +41,8 @@
 
             {% if not round.is_unscheduled %}
 
-              {% if voter.vote.vote == "agree" %}
-                <td class="text-success">{{ voter.vote.get_vote_display }}</td>
-              {% elif voter.vote.vote == "abstain" %}
-                <td class="text-warning">{{ voter.vote.get_vote_display }}</td>
-              {% elif voter.vote.vote == "disagree" %}
-                <td class="text-danger">{{ voter.vote.get_vote_display }}</td>
-              {% elif voter.vote.vote == "veto" %}
-                <td>
-                  <span class="badge bg-dark">{{ voter.vote.get_vote_display }}</span>
-                </td>
+              {% if voter.vote %}
+                <td class="text-{{ voter.vote.get_vote_bs_class }}">{{ voter.vote.get_vote_display }}</td>
               {% else %}
                 <td class="text-muted">No vote</td>
               {% endif %}