Hi Dundeedoll,
for citations where the same author has written more than one paper in the same year, the etiquette is to put 'a' after the first one and 'b' after the second one as in your second example above. In your bibliography you cite them in the order you used them in the text (2004a, 2004b, etc etc). Hope this answers your question!