changes related to email and invalid code page added