Fixes & improvements for doc interface two-factor