Fix email updating