[#8356] multifactor fixes
3 files changed