user validation
Merge branch 'mark_validation'