Critical fix for %user format