Add conditional validation for user model