[MERGED] Two Factor Auth

This topic has been merged into Two-Factor Auth.