Better email checking