I don't know about any of the other Apollo astronauts, and I wasn't around at the time, but I do remember once reading that a big deal was made about Neil Armstrong being a civilian when he landed on the moon.

Wikipedia at least says you're right -- he was a Naval Aviator and test pilot, but must have left the service when he went to NASA.