Failure to maintain soldier selection when using two vehicles on same mission

Its not fatal, but when you are prepping for a mission and going in and out of soldiers’ skill and equipment screens, the selected soldiers always default back to the first N that can go. This means I have to remember which of the barely distinguishable soldiers I want to select and do it at the very end.