Fixes weird issue with URLs sometimes being incorrect in confirmation emails. [fixes #47797201]
Merge branch 'refs/heads/develop'