Added keep inputs populated, email validation