added validation for e-mail addresses