Added extra check of changed mail address