What Type of Mortar do I need for a Glass Block Shower?

I have a glass block shower that was not installed properly. I need to know the proper way to regrout. The mortar is disintegrating. I was told I need a water-resistant mortar and to add an agent to make sure it’s waterproof. Does anyone know the proper way?