Different bug fixes admin and sendmail