issue #19560: fix new-user email to old-user problem