Added few validations in User