Bug 870512 - Ensure duplicate account checks don't apply to updates of t...

...he same account r=gaye