Fix for user validation