issue #19261: swat.
issue #19261: Fix user account issues.