diff --git a/app/views/admin/billing/prices/_form.html.erb b/app/views/admin/billing/prices/_form.html.erb
index e1a65280a..44bf00484 100644
--- a/app/views/admin/billing/prices/_form.html.erb
+++ b/app/views/admin/billing/prices/_form.html.erb
@@ -41,10 +41,10 @@
 
         <div class="col-sm-6">
             <div class="input-group">
-                <%= f.text_field :valid_from, value: f.object.valid_from.try(:to_s, :dshort),
+                <%= f.text_field :valid_from, value: f.object.valid_from.try(:to_date),
                                  class: 'form-control js-datepicker' %>
                 <span class="input-group-addon">-</span>
-                <%= f.text_field :valid_to, value: f.object.valid_to.try(:to_s, :dshort),
+                <%= f.text_field :valid_to, value: f.object.valid_to.try(:to_date),
                                  class: 'form-control js-datepicker' %>
             </div>
         </div>
diff --git a/config/initializers/datetime.rb b/config/initializers/datetime.rb
deleted file mode 100644
index cf4f747e2..000000000
--- a/config/initializers/datetime.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Some handy day formats
-Date::DATE_FORMATS[:dshort] = "%d.%m.%Y"
-Time::DATE_FORMATS[:dshort] = "%d.%m.%Y"