PLAT-6315 - Ensure security external ids are recorded and checked

Reviewed-by: Tim