added check for valid email, fixed google analytics