You are correct. I have administered the former and taken the latter in the Navy.
Enlisted members take the oath at the beginning of each period of enlistment. You will also note that there is no expiration date for officers as they only take the oath upon commissioning.
WWG1WGA
Garde la Foi, mes amis! Nous nous sommes les sauveurs de la République! Maintenant et Toujours!
(Keep the Faith, my friends! We are the saviors of the Republic! Now and Forever!)
LonePalm, le Républicain du verre cassé (The Broken Glass Republican)
Thanks for the additional.