diff --git a/edivorce/apps/core/static/js/ajax.js b/edivorce/apps/core/static/js/ajax.js
index ba49979d..59840b45 100644
--- a/edivorce/apps/core/static/js/ajax.js
+++ b/edivorce/apps/core/static/js/ajax.js
@@ -7,10 +7,11 @@ var ajaxOnChange = function () {
     var value = getValue(el, question);
     var isValid = true;
 
+    // todo: Can this be removed? the forceParse option in the datepicker seems to take care of date validation for us
     // Check if date is in valid format DD/MM/YYYY
-    if (el.is(".date-picker")){
-        isValid = validateDate(value);
-    }
+    //if (el.is(".date-picker")){
+    //    isValid = validateDate(value);
+    //}
 
     if (el.is("#email_textbox")){
         isValid = validateEmail(value);
diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index 70b604f8..6fbfce20 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -109,7 +109,7 @@ var deleteAddedField = function(e){
 
 // Configuration for datepicker
 var date_picker = function () {
-    $(".date-picker-group").datepicker({
+    $(".date-picker-group input").datepicker({
         format: "dd/mm/yyyy",
         startDate: "-100y",
         endDate: "0d",