diff --git a/templates/internal/admin/assign-supervisor.html.twig b/templates/internal/admin/assign-supervisor.html.twig
index cd959a0..4c9f2fa 100644
--- a/templates/internal/admin/assign-supervisor.html.twig
+++ b/templates/internal/admin/assign-supervisor.html.twig
@@ -27,8 +27,7 @@
 										<select name='{{ field_name(form.supervisor) }}' id='user_form_supervisor' class='form-control'>
 											<option value=''></option>
 											{% for s in supervisors %}
-												{% set selected = (s.id == data.id) %}
-												<option value='{{ s.id }}' {% if selected %} selected="true" {% endif %}>{{ s.name }}</option>
+												<option value='{{ s.id }}' {% if user.supervisor and user.supervisor.id == s.id %} selected="selected" {% endif %}>{{ s.name }}</option>
 											{% endfor %}
 										</select>
 									</div>