User service
Email template: tweak to improve diffability