diff --git a/js/directive/datepicker.js b/js/directive/datepicker.js
index 1cf19256b..74eadae80 100644
--- a/js/directive/datepicker.js
+++ b/js/directive/datepicker.js
@@ -30,9 +30,10 @@ app.directive('datepicker', function () {
 	return {
 		link: function (scope, elm, attr) {
 			return elm.datepicker({
-				dateFormat: 'yy-mm-dd',
+				dateFormat: moment.localeData().longDateFormat('L').replace('YYYY', 'YY').toLowerCase(),
 				onSelect: function(date, inst) {
-					scope.setDuedate(moment(date));
+					var selectedDate = $(this).datepicker('getDate');
+					scope.setDuedate(moment(selectedDate));
 					scope.$apply();
 				},
 				beforeShow: function(input, inst) {
diff --git a/js/filters/dateFilters.js b/js/filters/dateFilters.js
index 3121c4d50..0a2bbd18a 100644
--- a/js/filters/dateFilters.js
+++ b/js/filters/dateFilters.js
@@ -46,7 +46,8 @@ app.filter('dateToTimestamp', function() {
 app.filter('parseDate', function() {
 	return function (date) {
 		if(moment(date).isValid()) {
-			return moment(date).format('YYYY-MM-DD');
+		  var dateFormat = moment.localeData().longDateFormat('L');
+			return moment(date).format(dateFormat);
 		}
 		return '';
 	};