Bug 5161: Keep patron's attributes on warning/duplicate