Enhance user validation