diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 2724b2c14..c23561751 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,7 +2,8 @@
  - fix: CSS error in css03.css (perlDreamer Consulting, LLC)
  - fix: event tooltips are now displaying properly in all browsers
  - fix: .wgacess (perlDreamer Consulting, LLC)
- 
+ - fix: Fixed a bug where date form fields would not process epoch values 
+        correctly. (Martin Kamerbeek / Oqapi)
 
 7.3.4
  - fix: SQLForm - cannot add new asset (Martin Kamerbeek / Oqapi)
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index c4b4c7b5f..ec8f08eba 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -162,7 +162,7 @@ sub toHtml {
 	if ($self->get("_defaulted") && $self->get("noDate") ) {
 		# No default date
 		$value = $self->set("value",'');
-	} elsif (!$self->get("defaultValue") || $self->get("defaultValue") =~ m/^\d+$/) {
+	} elsif (!$self->get("defaultValue") || $self->get("value") =~ m/^\d+$/) {
 		# Epoch format
 		$value = $self->set("value",$self->session->datetime->epochToSet($self->get("value")));
 	} else {