Added email checking