Bug 20600: (follow-up) Restore patron name fix