added email checking support