TinyPixie, you are absolutely correct about the use of these prepositions, but there exists one nuance that you should take into consideration. Thus, on is used for giving phone numbers in British English, eg : Call us on 0800 0900017 , while at is chiefly used in American English. As to e-mail addresses, at is chiefly used in both dialects, just as you mentioned.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.