diff --git a/extensions/ComponentWatching/Extension.pm b/extensions/ComponentWatching/Extension.pm
index 9bd6a7fcf5..b5723c924c 100644
--- a/extensions/ComponentWatching/Extension.pm
+++ b/extensions/ComponentWatching/Extension.pm
@@ -245,7 +245,11 @@ sub _check_watch_user {
   if ($value !~ /@(?!invalid).+\.bugs$/i) {
     ThrowUserError('component_watch_invalid_watch_user');
   }
-  return Bugzilla::User->check($value)->id;
+
+  # Use a direct login->id lookup here instead of Bugzilla::User->check.
+  # During checksetup, User->check can try to load full user columns before
+  # schema upgrades are complete.
+  return Bugzilla::User::login_to_id($value, 1);
 }
 
 #