That's why I like the "if you want, we'll email you and then you can log in" approach to return visitors which works nicely for occasional use sites.

If the user creates a "new" account with the same email, it'll silently use the same account and not show them their history until they validate.