added enhanced clamav user handling