Merge pull request #2607 from groovecoder/change-welcome-email-from-775485

fix bug 775485 - welcome email tweaks