diff --git a/webtools/bugzilla/enter_bug.cgi b/webtools/bugzilla/enter_bug.cgi
index 7f74c54838e..b0dbeaa2ff3 100755
--- a/webtools/bugzilla/enter_bug.cgi
+++ b/webtools/bugzilla/enter_bug.cgi
@@ -356,6 +356,8 @@ $vars->{'group'} = \@groups;
 
 $vars->{'default'} = \%default;
 
+$vars->{'use_keywords'} = 1 if (@::legal_keywords);
+
 my $format = 
   GetFormat("bug/create/create", $::FORM{'format'}, $::FORM{'ctype'});
 
diff --git a/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl b/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
index 302c7e3d9ae..c59cd3a7078 100644
--- a/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
@@ -193,16 +193,18 @@
   </tr>
 
   [% IF UserInGroup('editbugs') %]
-    <tr>
-      <td align="right" valign="top">
-        <strong>
-          <a href="describekeywords.cgi">Keywords</a>:
-        </strong>
-      </td>
-      <td colspan="3">
-        <input name="keywords" size="60" value=""> (optional)
-      </td>
-    </tr>
+    [% IF use_keywords %]
+      <tr>
+        <td align="right" valign="top">
+          <strong>
+            <a href="describekeywords.cgi">Keywords</a>:
+          </strong>
+        </td>
+        <td colspan="3">
+          <input name="keywords" size="60" value=""> (optional)
+        </td>
+      </tr>
+    [% END %]
     <tr>
       <td align="right">
         <strong>Depends on:</strong>