diff --git a/ESSArch_Core/frontend/static/frontend/views/formly_templates/datepicker_template.html b/ESSArch_Core/frontend/static/frontend/views/formly_templates/datepicker_template.html
index 776b1142d..6e24832b2 100644
--- a/ESSArch_Core/frontend/static/frontend/views/formly_templates/datepicker_template.html
+++ b/ESSArch_Core/frontend/static/frontend/views/formly_templates/datepicker_template.html
@@ -16,6 +16,8 @@
   <a class="dropdown-toggle" id="dropdown-{{options.key}}" role="button" uib-dropdown-toggle>
     <div class="input-group">
       <input
+        ng-focus="status[options.key] = true"
+        ng-click="status[options.key] = false"
         ng-change="to.onChange"
         set-touched="options.formControl"
         id="{{::id}}"
@@ -24,14 +26,17 @@
         type="text"
         data-date-time-input="{{options.templateOptions.dateFormat ? options.templateOptions.dateFormat : 'YYYY-MM-DD'}}"
         data-model-type="{{options.templateOptions.dateFormat ? options.templateOptions.dateFormat : 'Date'}}"
+        data-date-formats="['YYYY-MMM-DD', 'YYYY', 'YYYY-MM']"
         class="form-control"
         data-ng-model="model[options.key]"
         autocomplete="off"
+        ng-disabled="to.disabled"
       /><span class="input-group-addon"><i class="fas fa-calendar-alt"></i></span>
     </div>
   </a>
   <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel" uib-dropdown-menu>
     <datetimepicker
+      ng-disabled="to.disabled"
       data-ng-model="model[options.key]"
       ng-change="status[options.key] = false"
       ng-required="options.templateOptions.required"