Fixed bug where a member with the same email as an entity could interfere with the entity