diff --git a/templates/index.html.tera b/templates/index.html.tera
index 9c8f302..f3c3c42 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -12,13 +12,6 @@
     <script defer="defer" type="text/javascript" src="/vote_chart.js"></script>
 </head>
 
-{# Check if the user has a vote in advance, for readability #}
-{% if user.logged_in == true and user.has_week_vote == true%}
-    {% set has_vote = true %}
-{% else %}
-    {% set has_vote = false %}
-{% endif -%}
-
 <body>
 <div class="top_bar">
     <h1>{{ title }}</h1>
@@ -78,7 +71,7 @@
         {% if user.logged_in == true and user.is_admin == false %}
             <br/>
             <button form="truths">
-                {%- if has_vote == true -%}
+                {%- if user.logged_in == true and user.has_week_vote == true -%}
                     Changer de vote
                 {% else %}
                     À voter !
diff --git a/templates/truth.html.tera b/templates/truth.html.tera
index c54388b..dca3ffd 100644
--- a/templates/truth.html.tera
+++ b/templates/truth.html.tera
@@ -12,11 +12,13 @@
                 <option value="0">---</option>
             {% for  player in other_players %}
                 {# Check if we should pre-select an existing vote #}
-                {% if has_vote == true and player.id == user.votes[truth_index].voted_id %}
-                    {% set is_selected = "selected" %}
-                {% else %}
-                    {% set is_selected = "" %}
-                {% endif %}
+                {% set_global is_selected = "" %}
+                {% for vote in user.votes %}
+                    {% if truth.id == vote.truth_id and player.id == vote.voted_id %}
+                        {% set_global is_selected = "selected" %}
+                        {% break %}
+                    {% endif %}
+                {% endfor %}
                 <option value="{{ player.id }}" {{- is_selected -}}>{{ player.name }}</option>
             {% endfor %}
         </select>
