Fixing SAC validation during create/update