fixed - right hadling of email checking, XSS security checks added