diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 978b4610b2..eea7631f99 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -480,7 +480,7 @@ class EventPlugin extends MicroappPlugin
 
     function onEndShowScripts($action)
     {
-        $action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });');
+        $action->inlineScript('$(document).ready(function() { $("#event-startdate").datepicker(); $("#event-enddate").datepicker(); });');
     }
 
     function onEndShowStyles($action)
diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
index e7d7a26bea..6a6e17e77b 100644
--- a/plugins/Event/eventform.php
+++ b/plugins/Event/eventform.php
@@ -83,7 +83,7 @@ class EventForm extends Form
      */
     function formData()
     {
-        $this->out->elementStart('fieldset', array('id' => 'new_bookmark_data'));
+        $this->out->elementStart('fieldset', array('id' => 'new_event_data'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();