diff --git a/webtools/bugzilla/enter_bug.cgi b/webtools/bugzilla/enter_bug.cgi
index ad421302370b..e9b599138515 100755
--- a/webtools/bugzilla/enter_bug.cgi
+++ b/webtools/bugzilla/enter_bug.cgi
@@ -98,6 +98,8 @@ if (!defined $product) {
            $vars->{'target'} = "enter_bug.cgi";
            $vars->{'format'} = $::FORM{'format'};
            
+           $vars->{'cloned_bug_id'} = $cgi->param('cloned_bug_id');
+
            print "Content-type: text/html\n\n";
            $template->process("global/choose-classification.html.tmpl", $vars)
              || ThrowTemplateError($template->error());
diff --git a/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl b/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
index 1d52b3686db3..3bb4be3a8b4f 100644
--- a/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
+++ b/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
@@ -36,6 +36,7 @@
   <tr>
     <th align="right" valign="center" height=50>
       <a href="[% target FILTER url_quote %]?classification=__all
+            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END %] 
             [% IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
       All</a>:
     </th>
@@ -49,6 +50,7 @@
   <tr>
     <th align="right" valign="top">
       <a href="[% target FILTER url_quote %]?classification=[% p FILTER url_quote %]
+            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END %] 
             [% IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
       [% p FILTER html %]</a>:
     </th>