Use principal rather than remoteUser in finishers