Adjust classes according to customer interface change - change eMail to
email