diff --git a/app/routes/admin/account.py b/app/routes/admin/account.py
index 17caae0..cfe7108 100644
--- a/app/routes/admin/account.py
+++ b/app/routes/admin/account.py
@@ -33,6 +33,7 @@ def adm_edit_account(user_id):
 
     for g in Group.query.all():
         setattr(GroupForm, f'g{g.id}', BooleanField(g.name))
+    setattr(GroupForm, "groups", {f'g{g.id}': g for g in Group.query.all()})
     setattr(GroupForm, "user_groups", [f'g{g.id}' for g in user.groups])
     group_form = GroupForm(prefix="group")
 
diff --git a/app/templates/admin/edit_account.html b/app/templates/admin/edit_account.html
index 23f1630..4f61a47 100644
--- a/app/templates/admin/edit_account.html
+++ b/app/templates/admin/edit_account.html
@@ -128,14 +128,11 @@
 		{{ group_form.hidden_tag() }}
 		<h2>Groupes</h2>
 		<div class="groups-panel flex-grid fg3">
-			{% for id, input in group_form.__dict__.items() %}
-			{% if id[0] == "g" %}
+			{% for id, g in group_form.groups.items() %}
 				<div>
-					{# TODO: add trophies icons #}
-					{{ input(checked=id in groups_owned) }}
-					{{ input.label }}
+					{{ group_form[id](checked=id in groups_owned) }}
+					{{ group_form[id].label(style=g.css) }}
 				</div>
-			{% endif %}
 			{% endfor %}
 		</div>
 		<div>{{ group_form.submit(class_="bg-ok") }}</div>