diff --git a/biscuit/core/templates/core/groups.html b/biscuit/core/templates/core/groups.html
index 7d81c4062b3bb9b2fa399863689813aaedef3949..24060931b6d8a1224b4e0a17aade6878ba39bb93 100644
--- a/biscuit/core/templates/core/groups.html
+++ b/biscuit/core/templates/core/groups.html
@@ -1,5 +1,5 @@
 {% extends "core/base.html" %}
-{% load bootstrap4 fontawesome i18n %}
+{% load bootstrap4 font_awesome i18n %}
 {% load render_table from django_tables2 %}
 
 {% block page_title %}{% blocktrans %}Groups{% endblocktrans %}{% endblock %}
diff --git a/biscuit/core/views.py b/biscuit/core/views.py
index 34c678e9e8ceb288ad74144620b2dd5437cea0d2..65002d9aea4d6697d773b37526c2f475af8649f1 100644
--- a/biscuit/core/views.py
+++ b/biscuit/core/views.py
@@ -165,7 +165,7 @@ def edit_person(request: HttpRequest, id_: int) -> HttpResponse:
 
 
 @admin_required
-def edit_group(request: HttpRequest, id_: Optional[int]) -> HttpResponse:
+def edit_group(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
     context = {}
 
     if id_: