diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 6e41a1a30..36c724fa4 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -148,11 +148,13 @@ sub getEditForm {
 			-name=>"namespace",
 			-options=>$namespaces,
 			-label=>WebGUI::International::get('namespace','Asset_Template'),
+			-hoverHelp=>WebGUI::International::get('namespace description','Asset_Template'),
 			-value=>[$session{form}{namespace}] 
 			);
 	} else {
 		$tabform->getTab("meta")->readOnly(
 			-label=>WebGUI::International::get('namespace','Asset_Template'),
+			-hoverHelp=>WebGUI::International::get('namespace description','Asset_Template'),
 			-value=>$self->getValue("namespace")
 			);	
 		$tabform->getTab("meta")->hidden(
@@ -164,10 +166,12 @@ sub getEditForm {
 		-name=>"showInForms",
 		-value=>$self->getValue("showInForms"),
 		-label=>WebGUI::International::get('show in forms', 'Asset_Template'),
+		-hoverHelp=>WebGUI::International::get('show in forms description', 'Asset_Template'),
 		);
         $tabform->getTab("properties")->codearea(
 		-name=>"template",
 		-label=>WebGUI::International::get('template', 'Asset_Template'),
+		-hoverHelp=>WebGUI::International::get('template description', 'Asset_Template'),
 		-value=>$self->getValue("template")
 		);
 	return $tabform;
diff --git a/lib/WebGUI/Help/Asset_Template.pm b/lib/WebGUI/Help/Asset_Template.pm
index d8b6cc35b..be7f13004 100644
--- a/lib/WebGUI/Help/Asset_Template.pm
+++ b/lib/WebGUI/Help/Asset_Template.pm
@@ -30,6 +30,21 @@ our $HELP = {
 		title => '684',
 		body => '639',
 		fields => [
+                        {
+                                title => 'namespace',
+                                description => 'namespace description',
+                                namespace => 'Asset_Template',
+                        },
+                        {
+                                title => 'show in forms',
+                                description => 'show in forms description',
+                                namespace => 'Asset_Template',
+                        },
+                        {
+                                title => 'template',
+                                description => 'template description',
+                                namespace => 'Asset_Template',
+                        },
 		],
 		related => [
 			{
diff --git a/lib/WebGUI/i18n/English/Asset_Template.pm b/lib/WebGUI/i18n/English/Asset_Template.pm
index 6cc4fde34..c8aebb5ae 100644
--- a/lib/WebGUI/i18n/English/Asset_Template.pm
+++ b/lib/WebGUI/i18n/English/Asset_Template.pm
@@ -51,19 +51,29 @@ our $I18N = {
 		message => q|<b>Template Name</b><br/>
 Give this template a descriptive name so that you'll know what it is when you're applying a template to content.
 <p/>
-
-<b>Namespace</b><br/>
-What type of template is this?
-<p/>
-
-<b>Template</b><br/>
-Create your template by using template commands and variables, macros, and HTML.
-<p/>
-
-<b>NOTE:</b> You should never edit the default templates that come with WebGUI as they are subject to change with each new release. Instead, copy the template you wish to edit, and edit the copy.|,
-		lastUpdated => 1038890615
+<b>NOTE:</b> You should never edit the default templates that come with WebGUI as they are subject to change with each new release. Instead, copy the template you wish to edit, and edit the copy.
+|,
+		lastUpdated => 1119979659
 	},
 
+        'namespace description' => {
+                message => q|What type of template is this?
+<p/>|,
+                lastUpdated => 1119979645,
+        },
+
+        'show in forms description' => {
+                message => q|Should this template be shown in the list of template from this namespace?
+<p/>|,
+                lastUpdated => 1119979645,
+        },
+
+        'template description' => {
+                message => q|Create your template by using template commands and variables, macros, and HTML.
+<p/>|,
+                lastUpdated => 1119979645,
+        },
+
 	'685' => {
 		message => q|Template, Delete|,
 		lastUpdated => 1038791020