diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 650bca502..bf723b9e0 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -6,6 +6,8 @@
    to static files.
  - Added a warning to the Passive Profiling feature that it may be illegal to
    use that feature in some countries.
+ - Fixed a problem where hidden form tags were not escaping macros properly.
+ - Fixed an XHTML problem with hidden form tags.
 
 
 6.2.4
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index 1c8af8dc2..a5e896910 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -858,7 +858,7 @@ The default value for this form element.
 =cut
 
 sub hidden {
-        return '<input type="hidden" name="'.$_[0]->{name}.'" value="'._fixQuotes(_fixSpecialCharacters($_[0]->{value})).'">'."\n";
+        return '<input type="hidden" name="'.$_[0]->{name}.'" value="'._fixQuotes(_fixMacros(_fixSpecialCharacters($_[0]->{value}))).'" />'."\n";
 }