Extend Two-factor authentication

This is a followup for !1575 (merged) to add more features while allowing the basics to be reviewd first.

Closes #2558 (closed)