diff --git a/css/osticket.css b/css/osticket.css
index 7417c890e8fb10ac8e7a0011d59bc53a593c39b8..d0423d732045919478f49c857e2cc52e71419172 100644
--- a/css/osticket.css
+++ b/css/osticket.css
@@ -23,3 +23,7 @@
 }
 
 #loading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
+
+input.dp {
+    width: 10em;
+}
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index 93fc68bad4f957eb3044b503eb5dc0c6df8ae4d9..0ea9b961c51e7271364373fe88fd42b3d291d6d0 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -2,6 +2,9 @@
 if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canEditTickets() || !$ticket) die('Access Denied');
 
 $info=Format::htmlchars(($errors && $_POST)?$_POST:$ticket->getUpdateInfo());
+if ($_POST)
+    $info['duedate'] = Format::date($cfg->getDateFormat(),
+       strtotime($info['duedate']));
 ?>
 <form action="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit" method="post" id="save"  enctype="multipart/form-data">
  <?php csrf_token(); ?>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 560eaae90a0c87e41d976a05a787ae3a7f2b3fea..d65294fa4435ced5f9b322340043ba0806a002e6 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1404,3 +1404,6 @@ ul.progress li.no small {color:red;}
 
 #loading h4, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
 
+input.dp {
+    width: 10em;
+}
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 386b128da2e645754bb6da0060b8f293ff71ca13..b791f24a2b8e849de6f8b454d5540a07b644625e 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -299,7 +299,14 @@ $(document).ready(function(){
             buttonImage: './images/cal.png',
             showOn:'both',
             dateFormat: df,
-         });
+        });
+        $(document).on('submit', 'form', function() {
+            $('.dp', $(this)).each(function(i, e) {
+                var $e = $(e),
+                    d = $e.datepicker('getDate');
+                $e.val(d.toJSON().substring(0,10));
+            });
+        });
     });
 
     /* NicEdit richtext init */