diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index b433807518e..5634f2513cf 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8683
\ No newline at end of file
+8684
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index f27baa532d2..842dacff439 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
@@ -1713,13 +1713,7 @@ sub _check_keywords {
         $keywords_in = trim($keywords_in);
         $keyword_array = [split(/[\s,]+/, $keywords_in)];
     }
-    
-    # On creation, only editbugs users can set keywords.
-    if (!ref $invocant) {
-        my $product = $params->{product};
-        return [] if !Bugzilla->user->in_group('editbugs', $product->id);
-    }
-    
+ 
     my %keywords;
     foreach my $keyword (@$keyword_array) {
         next unless $keyword;
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
index a2109c956fc..9c7775f0784 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
@@ -595,17 +595,17 @@ TUI_hide_default('attachment_text_field');
 </tbody>
 
 <tbody class="expert_fields">
+  [% IF use_keywords %]
+    <tr>
+      [% INCLUDE bug/field.html.tmpl
+        bug = default, field = bug_fields.keywords, editable = 1,
+        value = keywords, possible_values = all_keywords,
+        desc_url = "describekeywords.cgi", value_span = 2
+      %]
+    </tr>
+  [% END %]
+  
   [% IF user.in_group('editbugs', product.id) %]
-    [% IF use_keywords %]
-      <tr>
-        [% INCLUDE bug/field.html.tmpl
-           bug = default, field = bug_fields.keywords, editable = 1,
-           value = keywords, possible_values = all_keywords,
-           desc_url = "describekeywords.cgi", value_span = 2
-        %]
-      </tr>
-    [% END %]
-
     <tr>
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.dependson editable = 1