Bug 870512 - Ensure duplicate account checks don't apply to updates of the same account r=gaye