(CE-48) Staff with admin rights should use admin welcomes
Merge branch 'CE-48' into dev