3 files changed, 44 insertions, 10 deletions

diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index 0c6a8b335..c8838eea6 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -45,13 +45,30 @@
       </td>
     </tr>
     <tr>
-      <th align="right">Initial Owner:</th>
-      <td><input size="64" maxlength="64" name="initialowner" value=""></td>
+      <th align="right"><label for="initialowner">Initial Owner:</label></th>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name => "initialowner"
+           id => "initialowner"
+           value => ""
+           size => 64
+           emptyok => 1
+         %]
+      </td>
     </tr>
 [% IF Param('useqacontact') %]
     <tr>
-      <th align="right">Initial QA Contact:</th>
-      <td><input size="64" maxlength="64" name="initialqacontact" value=""></td>
+      <th align="right">
+        <label for="initialqacontact">Initial QA Contact:</label></th>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name => "initialqacontact"
+           id => "initialqacontact"
+           value => ""
+           size => 64
+           emptyok => 1
+         %]
+      </td>
     </tr>
 [% END %]
   </table>
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 0a8507917..580008008 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -55,16 +55,30 @@
       </td>
     </tr>
     <tr>
-      <td valign="top">Initial owner:</td>
-      <td><input size="64" maxlength="64" name="initialowner" value="
-      [%- initialowner FILTER html %]"></td>
+      <td valign="top"><label for="initialowner">Initial owner:</label></td>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name => "initialowner"
+           id => "initialowner"
+           value => initialowner
+           size => 64
+           emptyok => 1
+         %]
+      </td>
   
 [% IF Param('useqacontact') %]
     </tr>
     <tr>
-      <td valign="top">Initial QA contact:</td>
-      <td><input size="64" maxlength="64" name="initialqacontact" value="
-      [%- initialqacontact FILTER html %]"></td>
+      <td valign="top"><label for="initialqacontact">Initial QA contact:</label></td>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name => "initialqacontact"
+           id => "initialqacontact"
+           value => initialqacontact
+           size => 64
+           emptyok => 1
+         %]
+      </td>
 [% END %]
   
     </tr>
diff --git a/template/en/default/global/userselect.html.tmpl b/template/en/default/global/userselect.html.tmpl
index 91692fd21..24b16c9ec 100644
--- a/template/en/default/global/userselect.html.tmpl
+++ b/template/en/default/global/userselect.html.tmpl
@@ -18,6 +18,7 @@
   # userlist: select only; array reference with list of users and identities
   #                        userlist is built by Bugzilla::User::get_userlist()
   # name: mandatory; field name
+  # id: optional; field id
   # value: optional; default field value/selection
   # onchange: optional; onchange attribute value
   # disabled: optional; if true, the field is disabled
@@ -30,6 +31,7 @@
 
 [% IF Param("usemenuforusers") %]
 <select name="[% name FILTER html %]"
+  [% IF id %] id="[% id FILTER html %]" [% END %]
   [% IF onchange %] onchange="[% onchange FILTER html %]" [% END %]
   [% IF disabled %] disabled="[% disabled FILTER html %]" [% END %]
   [% IF accesskey %] accesskey="[% accesskey FILTER html %]" [% END %]
@@ -54,6 +56,7 @@
   [% IF disabled %] disabled="[% disabled FILTER html %]" [% END %]
   [% IF accesskey %] accesskey="[% accesskey FILTER html %]" [% END %]
   [% IF size %] size="[% size FILTER html %]" [% END %]
+  [% IF id %] id="[% id FILTER html %]" [% END %]
 >
 [% END %]