Adding and fixing user validation