9 hole option

I and others I know have Garmin watches.  We play in leagues during the week that are only 9 holes.  Starting holes for the front and back 9 are near each other. 

When I play 9 in league I don't always start on hole 1.  So when I finish 9, I go to hole 1, but my watch thinks I'm on 10.   I have to remember to change holes on the watch.  Talking to others everyone has a story about the time they forgot to switch and was hitting the wrong distance.

Proposed solution (if another one doesn't exist).  When I first start the round on my watch, after asking if I want to keep score, ask if I'm playing 9 or 18 holes.  Based on that answer you can then code the watch to know how to loop the holes based on the answer.  

Thoughts?

JerryK