added back some user validation