Fixing up validation for new users