diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb
index 2127ca9..43be163 100644
--- a/app/views/refinery/calendar/admin/events/_form.html.erb
+++ b/app/views/refinery/calendar/admin/events/_form.html.erb
@@ -18,12 +18,12 @@
 
   <div class='field'>
     <%= f.label :from -%>
-    <%= f.text_field :from, :class => 'datetime_range'  -%>
+    <%= text_field_tag "event[from]", l(@event.from || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
     <%= f.label :to -%>
-    <%= f.text_field :to, :class => 'datetime_range'  -%>
+    <%= text_field_tag "event[to]", l(@event.to || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
diff --git a/vendor/assets/javascripts/refinery/calendar.js.coffee b/vendor/assets/javascripts/refinery/calendar.js.coffee
index 52672a4..4670f35 100644
--- a/vendor/assets/javascripts/refinery/calendar.js.coffee
+++ b/vendor/assets/javascripts/refinery/calendar.js.coffee
@@ -1,7 +1,8 @@
 jQuery ->
   datetimes = $(".datetime_range").datetimepicker
     ampm: true
-    dateFormat: 'M d, yy'
+    dateFormat: 'yy-mm-dd'
+    timeFormat: 'hh:mm tt'
     changeMonth: true
     changeYear: true
     numberOfMonths: 2