diff --git a/webtools/bugzilla/enter_bug.cgi b/webtools/bugzilla/enter_bug.cgi
index 58662489a3c..5161fd21784 100755
--- a/webtools/bugzilla/enter_bug.cgi
+++ b/webtools/bugzilla/enter_bug.cgi
@@ -411,7 +411,7 @@ else {
     $vars->{'blocked'}        = formvalue('blocked');
     $vars->{'deadline'}       = formvalue('deadline');
 
-    $vars->{'cc'}             = formvalue('cc');
+    $vars->{'cc'}             = join(', ', $cgi->param('cc'));
 
     $vars->{'comment'}        = formvalue('comment');
     $vars->{'commentprivacy'} = formvalue('commentprivacy');
diff --git a/webtools/bugzilla/template/en/default/global/userselect.html.tmpl b/webtools/bugzilla/template/en/default/global/userselect.html.tmpl
index 24b16c9ecfd..7a46891abdb 100644
--- a/webtools/bugzilla/template/en/default/global/userselect.html.tmpl
+++ b/webtools/bugzilla/template/en/default/global/userselect.html.tmpl
@@ -41,9 +41,9 @@
     <option value=""></option>
   [% END %]
   [% FOREACH tmpuser = user.get_userlist %]
-    [% IF tmpuser.visible OR value == tmpuser.login %]
+    [% IF tmpuser.visible OR value.match("\\b$tmpuser.login\\b") %]
       <option value="[% tmpuser.login FILTER html %]"
-        [% " selected" IF value == tmpuser.login %]
+        [% " selected=\"selected\"" IF value.match("\\b$tmpuser.login\\b") %]
       >[% tmpuser.identity FILTER html %]</option>
     [% END %]
   [% END %]