Enhancement to Two Factor Auth (Closes #123)