added modal and email regex fix