diff --git a/calendar/event.php b/calendar/event.php
index 9461a7a4e37..5ba8ce51bff 100644
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -262,7 +262,7 @@
     }
 
     print_header($site->shortname.': '.$strcalendar.': '.$title, $strcalendar, $nav.' -> '.$title,
-                 $focus, '', true, '', user_login_string($site));
+                 'eventform.name', '', true, 'new.name', user_login_string($site));
 
     echo calendar_overlib_html();
 
diff --git a/calendar/event_edit.html b/calendar/event_edit.html
index c4dc49465f4..3a33f0bf0dd 100644
--- a/calendar/event_edit.html
+++ b/calendar/event_edit.html
@@ -1,4 +1,4 @@
-<form method="post" action="event.php" name="edit">
+<form method="post" action="event.php" name="eventform">
 <table cellpadding="5" cellspacing="0">
   <tr>
     <td style="vertical-align: top; text-align: right;">
diff --git a/calendar/event_new.html b/calendar/event_new.html
index 6820973cfd2..61331eef515 100644
--- a/calendar/event_new.html
+++ b/calendar/event_new.html
@@ -2,7 +2,7 @@
     // The following is a hack to fix bug 1488
     $course = get_record('course', 'id', ($form->courseid) ? $form->courseid : $site->id);
 ?>
-<form method="post" action="event.php" name="new">
+<form method="post" action="event.php" name="eventform">
 <table cellpadding="5">
   <tr>
     <td style="vertical-align: top; text-align: right;">