Add empty and email validators