diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
index 329243f..34be3c7 100644
--- a/grails-app/assets/javascripts/forms.js
+++ b/grails-app/assets/javascripts/forms.js
@@ -300,6 +300,14 @@ function orEmptyArray(v) {
             return _.isEqual(value1, value2);
         };
 
+        parser.functions.formatDateForValidation = function(value) {
+            if (!value) {
+                return '';
+            }
+
+            return moment(value).format('DD-MM-YYYY');
+        }
+
         var specialBindings = function() {
 
             return {
diff --git a/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp b/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp
index 0f7ffd2..5355b7e 100644
--- a/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp
+++ b/grails-app/views/output/_dateDataTypeEditModelTemplate.gsp
@@ -1,5 +1,5 @@
 <div id="${context.source}Date" class="input-group">
-    <input class="form-control form-control-sm inputDatePicker" ${context.attributes} data-bind="${context.databindAttrs}" type="text" size="12" ${context.validationAttr}/>
+    <input class="form-control form-control-sm inputDatePicker" ${context.attributes} data-bind="${context.databindAttrs}" type="text" size="12" autocomplete="off" ${context.validationAttr}/>
     <div class="input-group-append">
         <span class="add-on input-group-text open-datepicker"><i class="fa fa-th"></i></span>
     </div>
diff --git a/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy b/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy
index 2a9e5df..bcf9b52 100644
--- a/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy
+++ b/src/main/groovy/au/org/ala/ecodata/forms/EditModelWidgetRenderer.groovy
@@ -86,7 +86,7 @@ public class EditModelWidgetRenderer implements ModelWidgetRenderer {
     @Override
     void renderSimpleDate(WidgetRenderContext context) {
         context.databindAttrs.add 'datepicker', context.source + '.date'
-        context.writer << "<input${context.attributes.toString()} data-bind='${context.databindAttrs.toString()}'${context.validationAttr} type='text' class='form-control form-control-sm input-small'/>"
+        context.writer << "<input${context.attributes.toString()} data-bind='${context.databindAttrs.toString()}'${context.validationAttr} type='text' autocomplete='off' class='form-control form-control-sm input-small'/>"
     }
 
     @Override