All email changes fixed and verified on dev