diff --git a/pythonrewrite/templates/macros.cs b/pythonrewrite/templates/macros.cs
index 5183f50..7ef34b5 100644
--- a/pythonrewrite/templates/macros.cs
+++ b/pythonrewrite/templates/macros.cs
@@ -79,8 +79,8 @@ def:link(path, attr1, value1, attr2, value2)
 	?><?cs /if ?><?cs
  /def ?><?cs
 
-def:print_form_header(action) ?><?cs #
+def:print_form_header(form_name, action) ?><?cs #
 # the header of a form - including Setting.LinkAttrs
-	?><form action="<?cs call:link(action,"","","","") ?>" method="post" enctype="application/x-www-from-urlencoded" accept-charset="utf-8"><?cs
+	?><form name="<?cs var:html_escape(form_name) ?>" action="<?cs call:link(action,"","","","") ?>" method="post" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"><?cs
 /def ?>