Add user validation
Merge branch 'modeling-users'