Fix mail notification and add welcome admin