Fixes for auto-hiding of twofactor fields