KRACOEUS-7854: Fixing non-employee issues