diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm
index 6e1ec7822..caa90005b 100644
--- a/lib/WebGUI/Form/Asset.pm
+++ b/lib/WebGUI/Form/Asset.pm
@@ -117,7 +117,7 @@ Formats as a link.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $asset = WebGUI::Asset->newByDynamicClass($self->session,$self->getValue);
+    my $asset = WebGUI::Asset->newByDynamicClass($self->session,$self->getDefaultValue);
     if (defined $asset) {
         return '<a href="'.$asset->getUrl.'">'.$asset->getTitle.'</a>';
     }
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index bad71ec33..3487669b7 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -436,7 +436,7 @@ Returns the value rendered suitably in HTML. This is useful for forms that are r
 
 sub getValueAsHtml {
     my $self = shift;
-    return $self->getValue(@_);
+    return $self->getDefaultValue(@_);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index c3ba9eb50..f5d17c34b 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -169,7 +169,7 @@ sub getValueAsHtml {
 	} 
     else {
 		# MySQL format
-		my $value = $self->getValue;
+		my $value = $self->getDefaultValue;
         return $value;
 	}
 }
diff --git a/lib/WebGUI/Form/Email.pm b/lib/WebGUI/Form/Email.pm
index 4c1c77e01..1c0eeb75a 100644
--- a/lib/WebGUI/Form/Email.pm
+++ b/lib/WebGUI/Form/Email.pm
@@ -81,7 +81,7 @@ Formats as an email link.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $email = $self->getValue;
+    my $email = $self->getDefaultValue;
     return '<a href="mailto:'.$email.'">'.$email.'</a>';
 }
 
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index f623ae882..e61f61911 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -197,7 +197,7 @@ sub getValue {
 			return $id;
 		}
 	}
-	return undef;
+	return $value;
 }
 
 #-------------------------------------------------------------------
@@ -210,7 +210,7 @@ Displays the file as a link.
 
 sub getValueAsHtml {
 	my ($self) = @_;
-    my $value = $self->getValue;
+    my $value = $self->getDefaultValue;
 	return '' unless $value;
 	my $location = WebGUI::Storage->get($self->session,$value);
 	my $file = shift @{ $location->getFiles };
diff --git a/lib/WebGUI/Form/Group.pm b/lib/WebGUI/Form/Group.pm
index 8e1c7fc8f..1a1e79a1e 100644
--- a/lib/WebGUI/Form/Group.pm
+++ b/lib/WebGUI/Form/Group.pm
@@ -133,7 +133,7 @@ Formats as a name.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $group = WebGUI::Group->new($self->session, $self->getValue);
+    my $group = WebGUI::Group->new($self->session, $self->getDefaultValue);
     if (defined $group) {
         return $group->name;
     }
diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index 4632b52b5..9a2a0a630 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -181,7 +181,7 @@ Displays the image using an img tag.
 
 sub getValueAsHtml {
 	my ($self) = @_;
-    my $value = $self->getValue;
+    my $value = $self->getDefaultValue;
 	return '' unless $value;
 	my $location = WebGUI::Storage::Image->get($self->session, $value);
 	my $file = shift @{ $location->getFiles };
diff --git a/lib/WebGUI/Form/List.pm b/lib/WebGUI/Form/List.pm
index 40b251fff..bd6bdc740 100644
--- a/lib/WebGUI/Form/List.pm
+++ b/lib/WebGUI/Form/List.pm
@@ -261,7 +261,7 @@ Return all the options
 sub getValueAsHtml {
 	my ($self) = @_;
     my $options = $self->getOptions;
-    return join ", ", map { $options->{$_} } $self->getValue();
+    return join ", ", map { $options->{$_} } $self->getDefaultValue;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/Url.pm b/lib/WebGUI/Form/Url.pm
index a60081038..558d9b69c 100644
--- a/lib/WebGUI/Form/Url.pm
+++ b/lib/WebGUI/Form/Url.pm
@@ -112,7 +112,7 @@ Formats as a link.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $url = $self->getValue;
+    my $url = $self->getDefaultValue;
     return '<a href="'.$url.'">'.$url.'</a>';
 }
 
diff --git a/lib/WebGUI/Form/User.pm b/lib/WebGUI/Form/User.pm
index 97d9f3bb3..e26b3cd0c 100644
--- a/lib/WebGUI/Form/User.pm
+++ b/lib/WebGUI/Form/User.pm
@@ -117,7 +117,7 @@ Formats as a name.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $user = WebGUI::User->new($self->session, $self->getValue);
+    my $user = WebGUI::User->new($self->session, $self->getDefaultValue);
     if (defined $user) {
         return $user->username;
     }
diff --git a/lib/WebGUI/Form/Vendor.pm b/lib/WebGUI/Form/Vendor.pm
index e9ea5e92c..ec1bcaa53 100644
--- a/lib/WebGUI/Form/Vendor.pm
+++ b/lib/WebGUI/Form/Vendor.pm
@@ -119,7 +119,7 @@ Formats as a name.
 
 sub getValueAsHtml {
     my $self = shift;
-    my $vendor = eval{WebGUI::Shop::Vendor->new($self->session, $self->getValue)};
+    my $vendor = eval{WebGUI::Shop::Vendor->new($self->session, $self->getDefaultValue)};
     if (!$@ && defined $vendor) {
         return $vendor->get('name');
     }
diff --git a/lib/WebGUI/Form/YesNo.pm b/lib/WebGUI/Form/YesNo.pm
index 364c13a7c..5cd4b50e8 100644
--- a/lib/WebGUI/Form/YesNo.pm
+++ b/lib/WebGUI/Form/YesNo.pm
@@ -119,7 +119,7 @@ Shows either Yes or No.
 sub getValueAsHtml {
     my $self = shift;
     my $i18n = WebGUI::International->new($self->session);
-    if ($self->getValue) {
+    if ($self->getDefaultValue) {
         return $i18n->get(138);
     }
     return $i18n->get(139);