Make email changing better