diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 093ea0fed..3645c49f6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.5.20
+ - fixed: DataForm acknowledgement screen shows incorrect value for Date/Time fields
  - fixed: Some multipart mail messages have parts chosen incorrectly
  - fixed: File Pile doesn't respect edit permissions of parent asset
  - fixed: shortcut overrides new value column doesn't show macros as unparsed
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 3d2ebc219..84f0127be 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -598,6 +598,7 @@ sub getListUrl {
 sub getRecordTemplateVars {
 	my $self = shift;
 	my $var = shift;
+    my $entryData = shift;
 	my $i18n = WebGUI::International->new($self->session,"Asset_DataForm");
 	$var->{"back.url"} = $self->getUrl;
 	$var->{"back.label"} = $i18n->get(18);
@@ -607,7 +608,6 @@ sub getRecordTemplateVars {
     my $fields = $self->getFieldConfig;
     # If we have an entry id, we're doing this based on existing data
     my $entry;
-    my $entryData;
 	if ($var->{entryId}) {
 		$var->{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>"entryId",value=>$var->{entryId}});
         $entry = $self->getCollateral("DataForm_entry","DataForm_entryId",$var->{entryId});
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index 47f3ac615..e18230a19 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -447,7 +447,7 @@ Returns the value rendered suitably in HTML. This is useful for forms that are r
 
 sub getValueAsHtml {
     my $self = shift;
-    return $self->getDefaultValue(@_);
+    return $self->getOriginalValue(@_);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index 8a20b293c..4c325d434 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -178,10 +178,8 @@ Return the date in a human readable format.
 sub getValueAsHtml {
 	my ($self) = @_;
     # This should probably be rewritten as a cascading ternary
-	if (!$self->get("defaultValue") 
-        || $self->get("defaultValue") =~ m/^\d+$/
-        || !$self->get("value")     
-        || $self->get("value") =~ m/^\d+$/) {
+    my $formatValue = $self->getDefaultValue || $self->getOriginalValue;
+	if (!$formatValue || $formatValue =~ m/^\d+$/) {
 		return $self->session->datetime->epochToHuman($self->getOriginalValue,"%z %Z");
 	} 
     else {