Allows to send mails in staging
Fixes a css issue with the new user form
Merge branch 'master' into staging