refactor welcome email notification logic
Merge branch 'master' of github.com:psychotechnik/cpi