fix user validation
finish review