fix for change password form
Merge branch 'mail_fix'