Starting to make the new user form smarter