Fix change mail bug