changes to user validation stuff
merged