Bug 15699 [QA followup] - Only display firstname if present