If you haven't checked it out yet, this weekend Sephora debuted a brand new web site, and its great! If you are a beauty insider, they have all your purchases listed, so you can easily re-order. Also, they make adding samples and redeeming beauty points super easy at checkout!
The only bummer, especially for people like me that order constantly, is that you need to re-enter your payment information. But it will save going forward.