The key to this problem is to let your service advisor know of the discrepancy in the book and to make sure the lube guy knows. After they do a couple they'll get the hang of it, I'm sure.
Till then, I'll be double checking the oil level before I accept the car back.