Continue work on user validation