diff --git a/club/templates/club/edit_club.jinja b/club/templates/club/edit_club.jinja
index 2964fb64..d70e2140 100644
--- a/club/templates/club/edit_club.jinja
+++ b/club/templates/club/edit_club.jinja
@@ -27,7 +27,7 @@
       </p>
       <fieldset class="required margin-bottom">
         {% for field_name in form.admin_fields %}
-          {% set field = form.pop(field_name) %}
+          {% set field = form[field_name] %}
           <div class="form-group">
             {{ field.errors }}
             {{ field.label_tag() }}
diff --git a/club/tests.py b/club/tests.py
index 72dd8214..217f29f6 100644
--- a/club/tests.py
+++ b/club/tests.py
@@ -918,3 +918,14 @@ def test_club_board_member_cannot_edit_club_properties(client: Client):
     assert club.name == "old name"
     assert club.is_active
     assert club.address == "new address"
+
+
+@pytest.mark.django_db
+def test_edit_club_page_doesnt_crash(client: Client):
+    """crash test for club:club_edit"""
+    club = baker.make(Club)
+    user = subscriber_user.make()
+    baker.make(Membership, club=club, user=user, role=3)
+    client.force_login(user)
+    res = client.get(reverse("club:club_edit", kwargs={"club_id": club.id}))
+    assert res.status_code == 200