Last time I was up there I noticed Mt Baldy Lodge had installed a nice water dispenser for filling bottles outside their main entrance. There is also the spigot in front of the post office.

Wish I could go, but on my way to daughter's graduation. Post some pictures if you can for the rest of us!