Fixes #20515 - always find user by login
(cherry picked from commit d3fd7441f2c442467fdbea2fa30718e02f193988)
Fixes #20515 - always find user by login
(cherry picked from commit d3fd7441f2c442467fdbea2fa30718e02f193988)