I have observed a number of web-based login forms that offer 2-factor authentication do token entry on a second form after validating your username and password.
Is there a reason not to ask people for their 2-factor authentication token at the same time as their username and password?
A login form could detect a username that has 2-factor authentication enabled before they complete the login and present them a token-entry box on on the login page.
This would leak whether any given username had 2-factor authentication enabled, but wouldn't confirm a valid password without a valid token.