Fixed issues with default email, doesn't set select list to default