Enable the "Restrict to one member per e-mail address" option.

Actually had this enabled, but didn't realise it allowed for login via email. Thanks, but maybe the description could be updated to make this clearer. Also would be a nice touch to alter the login block when this is enabled. Anyhow, does the job, and I can edit the block to say "Email/Username". Thanks Chris.