diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 978dd3e..da383ec 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -90,7 +90,7 @@
                                     {% endfor %}
                                     {# Set default name to the selected role ID or first role if none selected #}
                                     <select id="cluster_{{ loop.index }}"
-                                            name="roles[{% if  selected_role_id != 'none' %}{{ selected_role_id }}{% else %}{{ cluster_roles[0].id }}{% endif %}]"
+                                            {% if selected_role_id == 'none' %} {% else %} name="roles[{{ selected_role_id }}]" {% endif %}
                                             {% if allowed_to_edit == false %}disabled{% endif %}
                                             onchange=" if (this.value === '') { this.removeAttribute('name'); } else { this.name = 'roles[' + this.options[this.selectedIndex].getAttribute('data-role-id') + ']'; }">
                                         <option value=""