Both frogs are adorable! I wouldn't worry about the water being untreated due to calcium deposits - my water is so hard here that it doesn't matter what I treat the water with, I still have white rings all over my bowls/aquariums. Just introduce him to the wonders of roaches and let him eat as much as he'll eat every day until he gets some weight back on, then cut back to every other day.

I would LOVE to see a photo of your beardie.