Added stuff in validate user