Bug/automatic setup email field update