diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f64b07ce5..2c1b17da0 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - fix: Newsletter can contain duplicate threads
  - fix: Captcha unreadable when using Image::Magick
  - fix: WebGUI::Group->new doesn't check group validity
+ - add form element template variables for event user defined fields
 
 7.4.7
  - fix: misspelled i18n in webgui password recovery
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index b52890d0c..894ff3de9 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -1251,7 +1251,7 @@ sub getTemplateVars {
     $var{ "relatedLinks" } = [];
     push @{$var{"relatedLinks"}}, { "linkUrl" => $_ }
         for ($self->getRelatedLinks);
-    
+	
     # Attachments
 
     my $gotImage;
@@ -1807,6 +1807,31 @@ sub www_edit {
             value   => $form->process("description") || $self->get("description"),
         });
     
+    # User defined
+    for my $x (1..5) {
+        my $userDefinedValue = $self->getValue("userDefined".$x);
+        $var->{'formUserDefined'.$x} = WebGUI::Form::text($session, {
+            name    => "userDefined" . $x,
+            value   => $userDefinedValue,
+        });
+        $var->{'formUserDefined'.$x.'_yesNo'} = WebGUI::Form::yesNo($session, {
+            name    => "userDefined".$x,
+            value   => $userDefinedValue,
+        });
+        $var->{'formUserDefined'.$x.'_textarea'} = WebGUI::Form::textarea($session, {
+            name    => "userDefined".$x,
+            value   => $userDefinedValue,
+        });
+        $var->{'formUserDefined'.$x.'_htmlarea'} = WebGUI::Form::HTMLArea($session, {
+            name    => "userDefined".$x,
+            value   => $userDefinedValue,
+        });
+		$var->{'formUserDefined'.$x.'_float'} = WebGUI::Form::Float($session, {
+            name    => "userDefined".$x,
+            value   => $userDefinedValue,
+        });
+    }
+    
     # File attachments
     $var->{"formAttachments"}
         = WebGUI::Form::Image($session, {
diff --git a/lib/WebGUI/Help/Asset_Event.pm b/lib/WebGUI/Help/Asset_Event.pm
index b8165a6d3..d5cc4db08 100644
--- a/lib/WebGUI/Help/Asset_Event.pm
+++ b/lib/WebGUI/Help/Asset_Event.pm
@@ -29,6 +29,11 @@ our $HELP = {
             { 'name' => 'formEndDate', },
             { 'name' => 'formEndTime', },
             { 'name' => 'formTime', },
+            { 'name' => 'formUserDefinedN', },
+            { 'name' => 'formUserDefinedN_yesNo', },
+            { 'name' => 'formUserDefinedN_textarea', },
+            { 'name' => 'formUserDefinedN_htmlarea', },
+            { 'name' => 'formUserDefinedN_float', },
             { 'name' => 'formRelatedLinks', },
             {   'name'     => 'formRecurPattern',
                 'required' => 1,
diff --git a/lib/WebGUI/i18n/English/Asset_Event.pm b/lib/WebGUI/i18n/English/Asset_Event.pm
index 716a1f620..9386d06ab 100644
--- a/lib/WebGUI/i18n/English/Asset_Event.pm
+++ b/lib/WebGUI/i18n/English/Asset_Event.pm
@@ -53,6 +53,31 @@ our $I18N = {
         message     => q|HTML form for adding or removing files from this Event.|,
         lastUpdated => 1177383776,
     },
+    
+    'formUserDefinedN'   => {
+        message     => q|For each of the 5 User Defined fields, a form widget for a single line of text.|,
+        lastUpdated => 1190816264,
+    },
+
+    'formUserDefinedN_yesNo'   => {
+        message     => q|For each of the 5 User Defined fields, a form widget for a yes/no field.|,
+        lastUpdated => 1190816264,
+    },
+
+    'formUserDefinedN_textarea'   => {
+        message     => q|For each of the 5 User Defined fields, a form widget for a text area.|,
+        lastUpdated => 1190816264,
+    },
+
+    'formUserDefinedN_htmlarea'   => {
+        message     => q|For each of the 5 User Defined fields, a form widget for a WYSIWIG HTML area.|,
+        lastUpdated => 1190816264,
+    },
+
+    'formUserDefinedN_float'   => {
+        message     => q|For each of the 5 User Defined fields, a form widget for a float.|,
+        lastUpdated => 1190816264,
+    },
 
 	'formStartDate'	=> {
 		message		=> q|HTML form for entering or editing the Event's start date.|,