Thanks Pontious,
My understanding is that the new pension scheme AFPS 05 (which I'm in) takes into account all service up to a maximum of 40 years for pension benefit. You are correct though for those on the old AFPS 75 scheme which only counted service from 18 or 21 depending on having a commission or not.
Rgds