DB/SAI: Non-repeatable flags change & credit circumvention

By dr-j fixes #10929 fixes #6444