Two-factor authentication made more convenient and secure