Safari 6.1 AutoFill Corrupts Data Entry Forms

A change in 6.1 / 7 is making AutoFill "too agressive" -- that is, if I have a data entry form, and there's a field with an email address in it, AutoFill is replacing that data with the login name for that site.

I'm the programmer for that site. I have changed the html name and id of the field so that 'email' is not even present. No matter what I name the field (it could be 'abcdefg') Safari still replaces the data.

The only conclusion I can come to after my testing is that no matter what the form (not a login form) and no matter what the field name, if Safari finds an email address that data gets stomped on by AutoFill.

This is making data entry web apps with email fields as data extremely prone to data corruption as every email is being replaced with the logged in user's own email address.

Has anyone dealt with this? Seen it? Found a work around?

Thanks.

-- gw