Fix for merging old users without payment data, template tweaks