diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
index df7d2a5d0..e05df5f43 100644
--- a/app/assets/javascripts/datepicker.js
+++ b/app/assets/javascripts/datepicker.js
@@ -8,7 +8,7 @@
     });
 
     function attachDatePicker() {
-        var dateFields = $('.datepicker');
+        var dateFields = $('.js-datepicker');
         dateFields.datepicker();
     }
 
diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index 2f70393c6..d8d5abcbe 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -24,11 +24,11 @@
         .col-md-3
           .form-group
             = f.label t(:receipt_date_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
         .col-md-3
           .form-group
             = f.label t(:receipt_date_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
         .col-md-3
           .form-group
             = label_tag t(:results_per_page)
diff --git a/app/views/admin/bank_statements/_form.haml b/app/views/admin/bank_statements/_form.haml
index 9fac97ee8..2449c640e 100644
--- a/app/views/admin/bank_statements/_form.haml
+++ b/app/views/admin/bank_statements/_form.haml
@@ -40,7 +40,7 @@
           .form-group
             = x.label :paid_at, class: 'col-md-4 control-label required'
             .col-md-8
-              = x.text_field(:paid_at, class: 'form-control datepicker', required: true)
+              = x.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
 
   %hr
   .row
diff --git a/app/views/admin/bank_transactions/_form.haml b/app/views/admin/bank_transactions/_form.haml
index b8c63c166..2702b858f 100644
--- a/app/views/admin/bank_transactions/_form.haml
+++ b/app/views/admin/bank_transactions/_form.haml
@@ -63,7 +63,7 @@
       .form-group
         = f.label :paid_at, class: 'col-md-4 control-label required'
         .col-md-8
-          = f.text_field(:paid_at, class: 'form-control datepicker', required: true)
+          = f.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
 
   %hr
   .row
diff --git a/app/views/admin/billing/prices/_form.html.erb b/app/views/admin/billing/prices/_form.html.erb
index 553615b79..e1a65280a 100644
--- a/app/views/admin/billing/prices/_form.html.erb
+++ b/app/views/admin/billing/prices/_form.html.erb
@@ -42,10 +42,10 @@
         <div class="col-sm-6">
             <div class="input-group">
                 <%= f.text_field :valid_from, value: f.object.valid_from.try(:to_s, :dshort),
-                                 class: 'form-control datepicker' %>
+                                 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),
-                                 class: 'form-control datepicker' %>
+                                 class: 'form-control js-datepicker' %>
             </div>
         </div>
     </div>
diff --git a/app/views/admin/blocked_domains/index.haml b/app/views/admin/blocked_domains/index.haml
index 2b46ac7fa..e4bcedfc3 100644
--- a/app/views/admin/blocked_domains/index.haml
+++ b/app/views/admin/blocked_domains/index.haml
@@ -13,11 +13,11 @@
         .col-md-3
           .form-group
             = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
         .col-md-3
           .form-group
             = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
       .row
         .col-md-3
           .form-group
diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index 07cf640ce..d9f60c13b 100644
--- a/app/views/admin/contacts/index.haml
+++ b/app/views/admin/contacts/index.haml
@@ -41,15 +41,15 @@
         .col-md-3
           .form-group
             = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
         .col-md-3
           .form-group
             = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
         .col-md-3
           .form-group
             = f.label t(:updated_at)
-            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
+            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
       .row
         .col-md-6
           .form-group
diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml
index f72ce8ff8..fdc6f64b2 100644
--- a/app/views/admin/domains/index.haml
+++ b/app/views/admin/domains/index.haml
@@ -28,11 +28,11 @@
         .col-md-3
           .form-group
             = f.label t(:valid_to_from)
-            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
+            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
         .col-md-3
           .form-group
             = f.label t(:valid_to_until)
-            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
+            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
       .row
         .col-md-6
           .form-group
diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml
index d8009a5ab..4909eb29e 100644
--- a/app/views/admin/epp_logs/index.haml
+++ b/app/views/admin/epp_logs/index.haml
@@ -31,11 +31,11 @@
         .col-md-3
           .form-group
             = f.label t(:created_after)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
         .col-md-3
           .form-group
             = f.label t(:created_before)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
         .col-md-3{style: 'padding-top: 25px;'}
           %button.btn.btn-primary
             &nbsp;
diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml
index 79d4fbb9d..ec43a8262 100644
--- a/app/views/admin/repp_logs/index.haml
+++ b/app/views/admin/repp_logs/index.haml
@@ -29,11 +29,11 @@
         .col-md-3
           .form-group
             = f.label t(:created_after)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
         .col-md-3
           .form-group
             = f.label t(:created_before)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
         .col-md-3{style: 'padding-top: 25px;'}
           %button.btn.btn-primary
             &nbsp;
diff --git a/app/views/admin/reserved_domains/index.haml b/app/views/admin/reserved_domains/index.haml
index 64e722bf6..194cf8875 100644
--- a/app/views/admin/reserved_domains/index.haml
+++ b/app/views/admin/reserved_domains/index.haml
@@ -13,11 +13,11 @@
         .col-md-3
           .form-group
             = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
         .col-md-3
           .form-group
             = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
       .row
         .col-md-3
           .form-group
diff --git a/app/views/registrant/domains/index.haml b/app/views/registrant/domains/index.haml
index b902229d0..056abd885 100644
--- a/app/views/registrant/domains/index.haml
+++ b/app/views/registrant/domains/index.haml
@@ -16,11 +16,11 @@
         .col-md-3
           .form-group
             = f.label t(:valid_to_from)
-            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
+            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
         .col-md-3
           .form-group
             = f.label t(:valid_to_until)
-            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
+            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
         .col-md-3
           .form-group
             = label_tag t(:results_per_page)
diff --git a/app/views/registrar/account_activities/index.haml b/app/views/registrar/account_activities/index.haml
index 97f9deb2a..4d8f2ff19 100644
--- a/app/views/registrar/account_activities/index.haml
+++ b/app/views/registrar/account_activities/index.haml
@@ -20,11 +20,11 @@
         .col-md-3
           .form-group
             = f.label t(:receipt_date_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
         .col-md-3
           .form-group
             = f.label t(:receipt_date_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
         .col-md-6{style: 'padding-top: 25px;'}
           %button.btn.btn-default
             &nbsp;
diff --git a/app/views/registrar/contacts/index.haml b/app/views/registrar/contacts/index.haml
index 3e0e59826..fd4672350 100644
--- a/app/views/registrar/contacts/index.haml
+++ b/app/views/registrar/contacts/index.haml
@@ -43,15 +43,15 @@
         .col-md-3
           .form-group
             = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
+            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
         .col-md-3
           .form-group
             = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
+            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
         .col-md-3
           .form-group
             = f.label t(:updated_at)
-            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
+            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
       .row
         .col-md-6
           .form-group
diff --git a/app/views/registrar/domains/index.haml b/app/views/registrar/domains/index.haml
index 29c88d39c..3bcda214f 100644
--- a/app/views/registrar/domains/index.haml
+++ b/app/views/registrar/domains/index.haml
@@ -34,11 +34,11 @@
         .col-md-3
           .form-group
             = f.label t(:valid_to_from)
-            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
+            = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
         .col-md-3
           .form-group
             = f.label t(:valid_to_until)
-            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
+            = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
       .row
         .col-md-6
         .col-md-3
diff --git a/app/views/registrar/invoices/index.haml b/app/views/registrar/invoices/index.haml
index 9ffd55811..64236d49d 100644
--- a/app/views/registrar/invoices/index.haml
+++ b/app/views/registrar/invoices/index.haml
@@ -24,11 +24,11 @@
         .col-md-3
           .form-group
             = f.label t(:due_date_from)
-            = f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control datepicker', placeholder: t(:due_date_from)
+            = f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control js-datepicker', placeholder: t(:due_date_from)
         .col-md-3
           .form-group
             = f.label t(:due_date_until)
-            = f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control datepicker', placeholder: t(:due_date_until)
+            = f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control js-datepicker', placeholder: t(:due_date_until)
       .row
         .col-md-3
           .form-group