diff --git a/views/quotes/edit.ctp b/views/quotes/edit.ctp
index 8101fba8..5755d802 100755
--- a/views/quotes/edit.ctp
+++ b/views/quotes/edit.ctp
@@ -34,9 +34,9 @@ echo $form->input('revision', array('type'=>'hidden'));
 echo $form->input('delivery_time');
 echo $form->input('payment_terms');
 echo $form->input('days_valid');
-echo $form->input('date_issued_display', array('id'=>'date_issued_display', 'label'=>'Date Issued'));
+echo $form->input('date_issued_display', array('id'=>'date_issued_display', 'label'=>'Date Issued', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['date_issued']))));
 echo $form->input('date_issued', array('type'=>'hidden', 'id'=>'date_issued'));
-echo $form->input('valid_until_display', array('id'=>'valid_until_display', 'label'=>'Valid Until'));
+echo $form->input('valid_until_display', array('id'=>'valid_until_display', 'label'=>'Valid Until', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['valid_until']))));
 echo $form->input('valid_until', array('type'=>'hidden', 'id'=>'valid_until'));
 echo $form->input('delivery_point');
 echo $form->input('exchange_rate');