diff --git a/CHANGES.md b/CHANGES.md
index e0f9034b..60eb556f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,9 @@ CHANGELOG
 8.9.2+dev  (XXXX-XX-XX)
 -----------------------
 
+**Bug fixes**
+
+- Change a balise to button balise on create or update button
 
 
 8.9.2      (2024-07-15)
diff --git a/mapentity/forms.py b/mapentity/forms.py
index d5ded371..c36d472e 100644
--- a/mapentity/forms.py
+++ b/mapentity/forms.py
@@ -85,11 +85,12 @@ def populate_fields(self):
 class SubmitButton(HTML):
 
     def __init__(self, div_id, label):
+        # onclik is here to bypass html5 validation
         content = ("""
-            <a id="{0}" class="btn btn-success"
-               onclick="javascript:$(this).parents('form').submit();">
+            <button type="submit" id="{0}" class="btn btn-success"
+                   onclick="this.form.submit();">
                 <i class="bi bi-check-circle-fill"></i> {1}
-            </a>""".format(div_id, label))
+            </button>""".format(div_id, label))
         super().__init__(content)