implemented second change mail step