Bug 14683: [QA Follow-up] Similar change for staff