--- a/server/src/main/webapp/WEB-INF/templates/fragment/userForm.html	Fri Nov 15 09:34:41 2013 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/fragment/userForm.html	Mon Nov 18 23:34:22 2013 +0100
@@ -43,7 +43,7 @@
             var dateFormat = /*[[#{date.date.datePicker.format}]]*/"yy/mm/dd";
             $.datepicker.setDefaults($.datepicker.regional[ "" ]);
             $('.datepicker').each(function (i,elt) {
-                var picker_options = $.extend({},$.datepicker.regional[regionalValue=="en"?"":regionalValue]);
+                var picker_options = $.extend({showButtonPanel: true},$.datepicker.regional[regionalValue=="en"?"":regionalValue]);
                 picker_options.dateFormat = dateFormat;
                 picker_options.altFormat = $.datepicker.ISO_8601;
                 var elt = $(elt);
@@ -110,13 +110,13 @@
        <div>
          <label for="credentialExpirationDate" th:text="#{renkanAdmin.form.credentialExpirationDate}">Credential expiration date: </label>
          <input type="hidden" name="credentialExpirationDate" th:field="*{credentialExpirationDate}"/>
-         <input type="date" id="credentialExpirationDate-disp" class="datepicker" value="01/01/1970" th:value="${user.credentialExpirationDate != null}?${#dates.format(user.credentialExpirationDate, #messages.msg('date.date.format'))}:''"/>
+         <input type="date" id="credentialExpirationDate-disp" class="datepicker" value="01/01/1970" th:value="${user.credentialExpirationDate != null}?${user.credentialExpirationDate.toString(#messages.msg('date.date.format'))}:''"/>
           
        </div>
        <div>
          <label for="expirationDate" th:text="#{renkanAdmin.form.expirationDate}">Expiration date: </label>
          <input type="hidden" name="expirationDate" th:field="*{expirationDate}" />
-         <input type="date" id="expirationDate-disp" class="datepicker" value="01/01/1970" th:value="${user.expirationDate != null}?${#dates.format(user.expirationDate, #messages.msg('date.date.format'))}:''"/> 
+         <input type="date" id="expirationDate-disp" class="datepicker" value="01/01/1970" th:value="${user.expirationDate != null}?${user.expirationDate.toString(#messages.msg('date.date.format'))}:''"/> 
        </div>
        <div>
          <label for="email" th:text="#{renkanAdmin.form.email}">Email: </label>