Bug fixes in mailing to the admin