New changes to resolve mandatory fields, email text