Partial revert of r56692 related to reverts in r56937: use old values for 'userlogin'