re #842 - Keep officers ID temporary