OK, I turned both of those COS options on and still only get the phone number when the call is answered. This on a 5340 phone. The phone shows the voicemail auto attendant port that the call is coming from while the phone is ringing.