|#1490|+Riya| Client side validation.