Bug/automatic setup email field update

Ah yes. Good spot.