fixes for email addresses and removed the class step