diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 61ad8209..26bff1b3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -166,4 +166,17 @@ module ApplicationHelper
     return rt+rp+rts
   end
 
+  def date_format_for_date_picker()
+    standard_format = current_user.prefs.date_format
+    translations = [
+      ['%m', 'mm'],
+      ['%d', 'dd'],
+      ['%Y', 'yy'],
+      ['%y', 'y']
+    ]
+    translations.inject(standard_format) do |str, translation|
+      str.gsub(*translation)
+    end
+  end
+
 end
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 0d7e34e8..bc8626c6 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -32,6 +32,7 @@
       var defaultContexts = <%= default_contexts_for_autocomplete %>;
       var defaultTags = <%= default_tags_for_autocomplete %>;
       var tagNames = <%= tag_names_for_autocomplete %>;
+      var dateFormat = '<%= date_format_for_date_picker %>';
       <% end -%>
     </script>
     <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 07d4cc41..7744a6c8 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -185,7 +185,7 @@ function project_defaults(){
 }
 
 function enable_rich_interaction(){
-  $('input.Date').datepicker();
+  $('input.Date').datepicker({'dateFormat': dateFormat});
   /* Autocomplete */
   $('input[name=context_name]').autocomplete(contextNames);
   $('input[name=project[default_context_name]]').autocomplete(contextNames);