diff --git a/webtools/bugzilla/editcomponents.cgi b/webtools/bugzilla/editcomponents.cgi
index 31b0a1171fd3..dd0711e569b5 100755
--- a/webtools/bugzilla/editcomponents.cgi
+++ b/webtools/bugzilla/editcomponents.cgi
@@ -286,6 +286,13 @@ if ($action eq 'new') {
                        {'name' => $component});
     }
 
+    # Do the user matching
+    Bugzilla::User::match_field ($cgi, {
+        'initialowner'     => { 'type' => 'single' },
+        'initialqacontact' => { 'type' => 'single' },
+    });
+
+
     my $initialowner = trim($cgi->param('initialowner') || '');
 
     if ($initialowner eq '') {
@@ -533,6 +540,13 @@ if ($action eq 'edit') {
 
 if ($action eq 'update') {
 
+    # Do the user matching
+    Bugzilla::User::match_field ($cgi, {
+        'initialowner'     => { 'type' => 'single' },
+        'initialqacontact' => { 'type' => 'single' },
+    });
+
+
     my $componentold        = trim($cgi->param('componentold')        || '');
     my $description         = trim($cgi->param('description')         || '');
     my $descriptionold      = trim($cgi->param('descriptionold')      || '');