Follow-up r86482, r86485: removed user_name portion of user_email index per CR